lib/ddr/models/indexing.rb in ddr-models-1.16.1 vs lib/ddr/models/indexing.rb in ddr-models-1.16.2

@@ -15,14 +15,15 @@
           INTERNAL_URI      => internal_uri,
           IDENTIFIER        => identifier_sort,
           WORKFLOW_STATE    => workflow_state,
           LOCAL_ID          => local_id,
           ADMIN_SET         => admin_set,
-          ADMIN_SET_FACET   => admin_set_facet,
-          COLLECTION_FACET  => collection_facet,
           PERMANENT_ID      => permanent_id,
           PERMANENT_URL     => permanent_url,
+          CREATOR_FACET     => creator,
+          DATE_FACET        => date,
+          DATE_SORT         => date_sort
         }
         if respond_to? :fixity_checks
           last_fixity_check = fixity_checks.last
           fields.merge!(last_fixity_check.to_solr) if last_fixity_check
         end
@@ -54,11 +55,17 @@
         end
         if is_a? Collection
           fields[DEFAULT_LICENSE_DESCRIPTION] = default_license_description
           fields[DEFAULT_LICENSE_TITLE] = default_license_title
           fields[DEFAULT_LICENSE_URL] = default_license_url
+          fields[ADMIN_SET_FACET] = admin_set_facet
+          fields[COLLECTION_FACET] = collection_facet
         end
+        if is_a? Item
+          fields[ADMIN_SET_FACET] = admin_set_facet
+          fields[COLLECTION_FACET] = collection_facet
+        end
         if respond_to? :roles
           fields.merge!(roles.index_fields)
         end
         fields
       end
@@ -86,9 +93,13 @@
         end
       end
 
       def collection_facet
         associated_collection.internal_uri if associated_collection.present?
+      end
+
+      def date_sort
+        date.first
       end
 
     end
   end
 end