Update db-dump, solr-ocrhighlighting plugin

kitodo · Sep 2, 2021 · ac87296 · ac87296
1 parent e546ab1
commit ac87296
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 33 deletions.
diff --git a/.ddev/solr/configsets/dlf/conf/solrconfig.xml b/.ddev/solr/configsets/dlf/conf/solrconfig.xml
@@ -702,18 +702,20 @@
       <str name="df">default</str>
       <str name="q.op">AND</str>
       <!-- Default search field
-         <str name="df">text</str> 
+         <str name="df">text</str>
         -->
       <!-- Change from JSON to XML format (the default prior to Solr 7.0)
-         <str name="wt">xml</str> 
+         <str name="wt">xml</str>
         -->
     </lst>
 
     <arr name="components">
-          <str>query</str>
-          <str>ocrHighlight</str>
-          <str>highlight</str>
-      </arr>
+      <str>query</str>
+      <str>facet</str>
+      <str>ocrHighlight</str>
+      <str>highlight</str>
+    </arr>
+
     <!-- In addition to defaults, "appends" params can be specified
          to identify values which should be appended to the list of
          multi-val params from the query (or the existing "defaults").
@@ -884,22 +886,22 @@
             <str name="queryAnalyzerFieldType">autocomplete</str>
         </lst>
     </searchComponent>
-  
+
  <schemaFactory class="ClassicIndexSchemaFactory"/>
-  
+
   <!-- Spell Check
 
        The spell check component can return a list of alternative spelling
        suggestions.
 
        http://wiki.apache.org/solr/SpellCheckComponent
     -->
-    
+
   <!-- Term Vector Component
 
        http://wiki.apache.org/solr/TermVectorComponent
     -->
-    
+
   <!-- Clustering Component. (Omitted here. See the default Solr example for a typical configuration.) -->
 
   <!-- Terms Component

diff --git a/.ddev/solr/contrib/ocrsearch/lib/solr-ocrhighlighting-0.7.0.jar b/.ddev/solr/contrib/ocrsearch/lib/solr-ocrhighlighting-0.7.0.jar
diff --git a/composer.json b/composer.json
@@ -1,8 +1,8 @@
 {
     "repositories": {
         "dlf": {
-            "type": "git",
-            "url": "https://github.com/beatrycze-volk/kitodo-presentation.git"
+            "type": "path",
+            "url": "/var/www/extensions/dlf"
         },
         "digitialcollections": {
             "type": "git",
@@ -40,7 +40,7 @@
         "typo3/cms-viewpage": "^9.5",
         "typo3/cms-lowlevel": "^9.5",
         "sgalinski/lfeditor": "^6.0",
-        "kitodo/presentation": "dev-use-solr-highlighting as dev-master",
+        "kitodo/presentation": "dev-beatrycze-volk-use-solr-highlighting as dev-master",
         "slub/slub-digitalcollections": "dev-master",
         "evoweb/ew-llxml2xliff": "^2",
         "solarium/solarium": "^4.2"

diff --git a/kitodo-slubdigitalcollections-search.sql.gz b/kitodo-slubdigitalcollections-search.sql.gz
diff --git a/kitodo-slubdigitalcollections.sql.gz b/kitodo-slubdigitalcollections.sql.gz
diff --git a/public/typo3conf/LocalConfiguration.php b/public/typo3conf/LocalConfiguration.php
@@ -20,10 +20,10 @@
     ],
     'EXT' => [
         'extConf' => [
-            'backend' => 'a:6:{s:9:"loginLogo";s:0:"";s:19:"loginHighlightColor";s:0:"";s:20:"loginBackgroundImage";s:0:"";s:13:"loginFootnote";s:0:"";s:11:"backendLogo";s:0:"";s:14:"backendFavicon";s:0:"";}',
-            'dlf' => 'a:49:{s:15:"metadataFormats";s:1:"0";s:9:"useragent";s:19:"Kitodo.Presentation";s:16:"forceAbsoluteUrl";s:1:"0";s:21:"forceAbsoluteUrlHttps";s:1:"0";s:7:"caching";s:1:"0";s:21:"publishNewCollections";s:1:"1";s:13:"unhideOnIndex";s:1:"0";s:13:"fileGrpImages";s:11:"DEFAULT,MAX";s:13:"fileGrpThumbs";s:6:"THUMBS";s:15:"fileGrpDownload";s:8:"DOWNLOAD";s:15:"fileGrpFulltext";s:8:"FULLTEXT";s:12:"fileGrpAudio";s:5:"AUDIO";s:16:"indexAnnotations";s:1:"0";s:18:"iiifThumbnailWidth";s:3:"150";s:19:"iiifThumbnailHeight";s:3:"150";s:11:"solrConnect";s:1:"0";s:9:"solrHttps";s:1:"0";s:8:"solrHost";s:4:"solr";s:8:"solrPort";s:4:"8983";s:8:"solrPath";s:1:"/";s:8:"solrUser";s:0:"";s:8:"solrPass";s:0:"";s:11:"solrTimeout";s:2:"10";s:19:"solrAllowCoreDelete";s:1:"0";s:11:"solrFieldId";s:2:"id";s:12:"solrFieldUid";s:3:"uid";s:12:"solrFieldPid";s:3:"pid";s:13:"solrFieldPage";s:4:"page";s:15:"solrFieldPartof";s:6:"partof";s:13:"solrFieldRoot";s:4:"root";s:12:"solrFieldSid";s:3:"sid";s:17:"solrFieldToplevel";s:8:"toplevel";s:13:"solrFieldType";s:4:"type";s:14:"solrFieldTitle";s:5:"title";s:15:"solrFieldVolume";s:6:"volume";s:18:"solrFieldThumbnail";s:9:"thumbnail";s:16:"solrFieldDefault";s:7:"default";s:18:"solrFieldTimestamp";s:9:"timestamp";s:21:"solrFieldAutocomplete";s:12:"autocomplete";s:17:"solrFieldFulltext";s:8:"fulltext";s:17:"solrFieldRecordId";s:9:"record_id";s:13:"solrFieldPurl";s:4:"purl";s:12:"solrFieldUrn";s:3:"urn";s:17:"solrFieldLocation";s:8:"location";s:19:"solrFieldCollection";s:10:"collection";s:16:"solrFieldLicense";s:7:"license";s:14:"solrFieldTerms";s:5:"terms";s:21:"solrFieldRestrictions";s:12:"restrictions";s:13:"solrFieldGeom";s:4:"geom";}',
+            'backend' => 'a:6:{s:14:"backendFavicon";s:0:"";s:11:"backendLogo";s:0:"";s:20:"loginBackgroundImage";s:0:"";s:13:"loginFootnote";s:0:"";s:19:"loginHighlightColor";s:0:"";s:9:"loginLogo";s:0:"";}',
+            'dlf' => 'a:47:{s:9:"useragent";s:19:"Kitodo.Presentation";s:16:"forceAbsoluteUrl";s:1:"0";s:21:"forceAbsoluteUrlHttps";s:1:"0";s:7:"caching";s:1:"0";s:21:"publishNewCollections";s:1:"1";s:13:"unhideOnIndex";s:1:"0";s:13:"fileGrpImages";s:11:"DEFAULT,MAX";s:13:"fileGrpThumbs";s:6:"THUMBS";s:15:"fileGrpDownload";s:8:"DOWNLOAD";s:15:"fileGrpFulltext";s:8:"FULLTEXT";s:12:"fileGrpAudio";s:5:"AUDIO";s:16:"indexAnnotations";s:1:"0";s:18:"iiifThumbnailWidth";s:3:"150";s:19:"iiifThumbnailHeight";s:3:"150";s:9:"solrHttps";s:1:"0";s:8:"solrHost";s:4:"solr";s:8:"solrPort";s:4:"8983";s:8:"solrPath";s:1:"/";s:8:"solrUser";s:0:"";s:8:"solrPass";s:0:"";s:11:"solrTimeout";s:2:"10";s:19:"solrAllowCoreDelete";s:1:"1";s:11:"solrFieldId";s:2:"id";s:12:"solrFieldUid";s:3:"uid";s:12:"solrFieldPid";s:3:"pid";s:13:"solrFieldPage";s:4:"page";s:15:"solrFieldPartof";s:6:"partof";s:13:"solrFieldRoot";s:4:"root";s:12:"solrFieldSid";s:3:"sid";s:17:"solrFieldToplevel";s:8:"toplevel";s:13:"solrFieldType";s:4:"type";s:14:"solrFieldTitle";s:5:"title";s:15:"solrFieldVolume";s:6:"volume";s:18:"solrFieldThumbnail";s:9:"thumbnail";s:16:"solrFieldDefault";s:7:"default";s:18:"solrFieldTimestamp";s:9:"timestamp";s:21:"solrFieldAutocomplete";s:12:"autocomplete";s:17:"solrFieldFulltext";s:8:"fulltext";s:17:"solrFieldRecordId";s:9:"record_id";s:13:"solrFieldPurl";s:4:"purl";s:12:"solrFieldUrn";s:3:"urn";s:17:"solrFieldLocation";s:8:"location";s:19:"solrFieldCollection";s:10:"collection";s:16:"solrFieldLicense";s:7:"license";s:14:"solrFieldTerms";s:5:"terms";s:21:"solrFieldRestrictions";s:12:"restrictions";s:13:"solrFieldGeom";s:4:"geom";}',
             'extensionmanager' => 'a:2:{s:21:"automaticInstallation";s:1:"1";s:11:"offlineMode";s:1:"0";}',
-            'lfeditor' => 'a:9:{s:13:"viewLanguages";s:0:"";s:15:"defaultLanguage";s:0:"";s:11:"searchRegex";s:60:"/^([a-z0-9_]*locallang[a-z0-9_-]*\\.(php|xml)|[^\\.]*\\.xlf)$/i";s:9:"extIgnore";s:23:"/^(CVS|.svn|.git|csh_)/";s:12:"extWhitelist";s:0:"";s:13:"changeXlfDate";s:1:"1";s:17:"editModeExtension";s:1:"1";s:27:"pathAdditionalConfiguration";s:37:"typo3conf/AdditionalConfiguration.php";s:16:"beMainModuleName";s:4:"user";}',
+            'lfeditor' => 'a:9:{s:16:"beMainModuleName";s:4:"user";s:13:"changeXlfDate";s:1:"1";s:15:"defaultLanguage";s:0:"";s:17:"editModeExtension";s:1:"1";s:9:"extIgnore";s:23:"/^(CVS|.svn|.git|csh_)/";s:12:"extWhitelist";s:0:"";s:27:"pathAdditionalConfiguration";s:37:"typo3conf/AdditionalConfiguration.php";s:11:"searchRegex";s:60:"/^([a-z0-9_]*locallang[a-z0-9_-]*\\.(php|xml)|[^\\.]*\\.xlf)$/i";s:13:"viewLanguages";s:0:"";}',
             'scheduler' => 'a:2:{s:11:"maxLifetime";s:4:"1440";s:15:"showSampleTasks";s:1:"1";}',
         ],
     ],
@@ -48,10 +48,8 @@
             'iiifThumbnailHeight' => '150',
             'iiifThumbnailWidth' => '150',
             'indexAnnotations' => '0',
-            'metadataFormats' => '0',
             'publishNewCollections' => '1',
-            'solrAllowCoreDelete' => '0',
-            'solrConnect' => '0',
+            'solrAllowCoreDelete' => '1',
             'solrFieldAutocomplete' => 'autocomplete',
             'solrFieldCollection' => 'collection',
             'solrFieldDefault' => 'default',
@@ -108,6 +106,12 @@
         ],
     ],
     'FE' => [
+        'cacheHash' => [
+            'excludeAllEmptyParameters' => true,
+            'requireCacheHashPresenceParameters' => [
+                'tx_dlf[id]',
+            ],
+        ],
         'debug' => true,
         'loginSecurityLevel' => 'normal',
         'pageNotFoundOnCHashError' => false,

diff --git a/start-slubdigitalcollections-search.sh b/start-slubdigitalcollections-search.sh