lib/runcible/extensions/repository.rb in runcible-0.1.3 vs lib/runcible/extensions/repository.rb in runcible-0.1.4

@@ -88,13 +88,11 @@
       end
 
       def self.rpm_remove(repo_id, package_ids)
         criteria = {:type_ids => ['rpm'], :filters => {}}
         criteria[:filters]['association'] = {'unit_id' => {'$in' => package_ids}}
-        payload = {}
-        payload[:criteria] = criteria
-        self.unassociate_units(repo_id, payload)
+        self.unassociate_units(repo_id, criteria)
       end
 
        #optional
       #  errata_ids
       def self.errata_copy(source_repo_id, destination_repo_id, optional={})
@@ -105,12 +103,11 @@
       end
 
       def self.errata_remove(repo_id, errata_ids)
         criteria = {:type_ids => ['erratum'], :filters => {}}
         criteria[:filters][:unit] = { :id=>{ '$in' => errata_ids } }
-        payload = {:criteria => criteria}
-        self.unassociate_units(repo_id, payload)
+        self.unassociate_units(repo_id, criteria)
       end
 
       #optoinal
       #  distribution_ids
       def self.distribution_copy(source_repo_id, destination_repo_id, optional={})
@@ -121,27 +118,20 @@
       end
 
       def self.distribution_remove(repo_id, distribution_id)
         criteria = {:type_ids => ['distribution'], :filters => {}}
         criteria[:filters][:unit] = { :id=>{ '$in' => [distribution_id] } }
-        payload = {:criteria => criteria}
-        self.unassociate_units(repo_id, payload)
+        self.unassociate_units(repo_id, criteria)
       end
 
       def self.rpm_ids(id)
-        criteria = {:type_ids=>['rpm'],
-                :sort => {
-                    :unit => [ ['name', 'ascending'], ['version', 'descending'] ]
-                }}
+        criteria = {:type_ids=>['rpm']}
         self.unit_search(id, criteria).collect{|i| i['unit_id']}
       end
 
       def self.rpms(id)
-        criteria = {:type_ids=>['rpm'],
-                :sort => {
-                    :unit => [ ['name', 'ascending'], ['version', 'descending'] ]
-                }}
+        criteria = {:type_ids=>['rpm']}
         self.unit_search(id, criteria).collect{|i| i['metadata'].with_indifferent_access}
       end
 
       def self.packages_by_nvre(id, name, version=nil, release=nil, epoch=nil)
         and_condition = []
@@ -161,48 +151,28 @@
                 }}
         self.unit_search(id, criteria).collect{|p| p['metadata'].with_indifferent_access}
       end
 
       def self.errata_ids(id, filter = {})
-         criteria = {
-            :type_ids=>['erratum'],
-            :sort => {
-                :unit => [ ['title', 'ascending'] ]
-            }
-           }
+         criteria = {:type_ids=>['erratum']}
 
          self.unit_search(id, criteria).collect{|i| i['unit_id']}
       end
 
       def self.distributions(id)
-        criteria = {
-                  :type_ids=>['distribution'],
-                  :sort => {
-                      :unit => [ ['id', 'ascending'] ]
-                  }
-            }
+        criteria = {:type_ids=>['distribution']}
 
         self.unit_search(id, criteria).collect{|i| i['metadata'].with_indifferent_access}
       end
 
       def self.package_groups(id)
-        criteria = {
-                  :type_ids=>[Runcible::Extensions::PackageGroup::TYPE],
-                  :sort => {
-                      :unit => [ ['id', 'ascending'] ]
-                  }
-            }
+        criteria = {:type_ids=>[Runcible::Extensions::PackageGroup::TYPE]}
 
         self.unit_search(id, criteria).collect{|i| i['metadata'].with_indifferent_access}
       end
 
       def self.package_categories(id)
-        criteria = {
-                  :type_ids=>[Runcible::Extensions::PackageCategory::TYPE],
-                  :sort => {
-                      :unit => [ ['id', 'ascending'] ]
-                  }
-            }
+        criteria = {:type_ids=>[Runcible::Extensions::PackageCategory::TYPE]}
         self.unit_search(id, criteria).collect{|i| i['metadata'].with_indifferent_access}
       end
 
       def self.create_or_update_schedule(repo_id, type, schedule)
         schedules = Runcible::Resources::RepositorySchedule.list(repo_id, type)