indexing.rb in ddr-models-2.0.0.pre.3

- old
+ new

@@ -15,18 +15,19 @@
           INTERNAL_URI      => internal_uri,
           IDENTIFIER_ALL    => all_identifiers,
           WORKFLOW_STATE    => workflow_state,
           LOCAL_ID          => local_id,
           ADMIN_SET         => admin_set,
-          ADMIN_SET_FACET   => admin_set_facet,
-          COLLECTION_FACET  => collection_facet,
           DISPLAY_FORMAT    => display_format,
-          PERMANENT_ID   => permanent_id,
-          PERMANENT_URL  => permanent_url,
-          ACCESS_ROLE    => roles.to_json,
-          RESOURCE_ROLE  => roles.in_resource_scope.agents,
-          POLICY_ROLE    => roles.in_policy_scope.agents,
+          PERMANENT_ID      => permanent_id,
+          PERMANENT_URL     => permanent_url,
+          ACCESS_ROLE       => roles.to_json,
+          RESOURCE_ROLE     => roles.in_resource_scope.agents,
+          POLICY_ROLE       => roles.in_policy_scope.agents,
+          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
@@ -48,21 +49,30 @@
           fields[MEDIA_SUB_TYPE] = content_sub_type
         end
         if has_multires_image?
           fields[MULTIRES_IMAGE_FILE_PATH] = multires_image_file_path
         end
+        if has_struct_metadata?
+          fields[STRUCT_MAPS] = structure.struct_maps.to_json
+        end
         if has_extracted_text?
           fields[EXTRACTED_TEXT] = extractedText.content
         end
         if is_a? Component
           fields[COLLECTION_URI] = collection_uri
         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
         fields
       end
 
       def title_display
         return title.first if title.present?
@@ -87,9 +97,13 @@
         end
       end
 
       def collection_facet
         associated_collection.internal_uri if associated_collection.present?
+      end
+
+      def date_sort
+        date.first
       end
 
     end
   end
 end