====== Islandora update from GIT (HEAD) ====== \\ * List modules drush pm-list Islandora U Islandora (islandora) Module Enabled 7.x-dev Islandora _ Islandora Biological Entity (islandora_solution_pack_biological_entity) Module Disabled 7.x-1.x-dev Islandora _ Islandora Ontologies (islandora_ontologies) Module Enabled 7.x-0.1 Islandora U Islandora Solr Metadata (islandora_solr_metadata) Module Enabled 7.x-dev Islandora customizations _ Islandora Relationship Editor (islandora_relationship_editor) Module Disabled 7.x-0.1 Islandora Dependencies U Islandora XML Form API (xml_form_api) Module Disabled 7.x-dev Islandora Dependencies U Islandora XML Form Elements (xml_form_elements) Module Disabled 7.x-dev Islandora Dependencies U Islandora XML Schema API (xml_schema_api) Module Disabled 7.x-dev Islandora Dependencies U Objective Forms (objective_forms) Module Disabled 7.x-dev Islandora Dependencies U PHP Lib (php_lib) Module Disabled 7.x-dev Islandora Search U Islandora Solr (islandora_solr) Module Enabled 7.x-dev Islandora Search U Islandora Solr display profiles (islandora_solr_config) Module Not installed 7.x-dev Islandora Search U Islandora Solr Geographical display profile (islandora_solr_geo) Module Not installed 7.x-dev Islandora Solution Packs U Islandora basic collection (islandora_basic_collection) Module Enabled 7.x-dev Islandora Solution Packs U Islandora Book Solution Pack (islandora_book) Module Enabled 7.x-dev Islandora Solution Packs U Islandora compound object (islandora_compound_object) Module Enabled Islandora Solution Packs U Islandora Large Image Solution Pack (islandora_large_image) Module Enabled 7.x-dev Islandora Solution Packs U Islandora Paged Content (islandora_paged_content) Module Enabled 7.x-dev Islandora Tools U Islandora OCR (islandora_ocr) Module Enabled 7.x-dev Islandora Tools U Islandora Xacml Api (islandora_xacml_api) Module Enabled 7.x-dev Islandora Tools U Islandora XACML Editor (islandora_xacml_editor) Module Enabled 7.x-dev Islandora Tools U Islandora XML Form Builder (xml_form_builder) Module Disabled 7.x-dev Islandora Tools U Islandora XML Forms (xml_forms) Module Disabled 7.x-dev Islandora Viewers U Islandora Internet Archive BookReader (islandora_internet_archive_bookreader) Module Enabled 7.x-dev Islandora Viewers U Islandora OpenSeadragon (islandora_openseadragon) Module Enabled 7.x-dev Other Colorbox (colorbox) Module Enabled 7.x-2.8 Other ImageMagick (imagemagick) Module Enabled 7.x-1.0 Other ImageMagick Advanced (imagemagick_advanced) Module Not installed 7.x-1.0 Other Libraries (libraries) Module Enabled 7.x-2.2 ls -l sites/all/modules/islandora/ total 72 drwxr-xr-x 11 root root 4096 Jun 18 13:20 islandora drwxr-xr-x 9 root root 4096 Jun 18 14:29 islandora_internet_archive_bookreader drwxr-xr-x 6 root root 4096 Jun 18 14:10 islandora_ocr drwxr-xr-x 8 root root 4096 Jun 18 13:33 islandora_openseadragon drwxr-xr-x 10 root root 4096 Jun 18 14:07 islandora_paged_content drwxr-xr-x 5 root root 4096 Mar 17 2014 islandora_relationship_editor drwxr-xr-x 6 root root 4096 Jul 22 09:38 islandora_solr_metadata drwxr-xr-x 13 root root 4096 Jun 18 14:14 islandora_solr_search drwxr-xr-x 9 root root 4096 Apr 15 2014 islandora_solution_pack_biological_entity drwxr-xr-x 10 root root 4096 Jun 18 14:49 islandora_solution_pack_book drwxr-xr-x 10 root root 4096 Jun 18 13:26 islandora_solution_pack_collection drwxr-xr-x 9 root root 4096 Jul 21 15:30 islandora_solution_pack_compound drwxr-xr-x 10 root root 4096 Jun 18 13:38 islandora_solution_pack_large_image drwxr-xr-x 13 giancarlo root 4096 Jul 24 09:34 islandora_solution_pack_ontologies-7.x-dev drwxr-xr-x 8 root root 4096 Jun 18 14:22 islandora_xacml_editor drwxr-xr-x 8 root root 4096 Apr 15 2014 islandora_xml_forms drwxr-xr-x 5 root root 4096 Apr 15 2014 objective_forms * drwxr-xr-x 7 root root 4096 Apr 15 2014 php_lib ls -l sites/all/libraries/ total 20 drwxr-xr-x 6 root root 4096 Oct 30 11:04 bookreader drwxr-xr-x 9 root root 4096 Oct 5 17:52 colorbox drwxr-xr-x 8 root root 4096 Oct 30 11:31 JAIL drwxr-xr-x 3 root root 4096 Jun 18 13:55 openseadragon drwxr-xr-x 4 root root 4096 Oct 30 11:26 tuque \\ * Backup (1) cd /usr/share/siteROOT/ drush archive-dump (2) drush vset --exact maintenance_mode 1 rm -R ~/islandora_modules_bck/* rm -R ~/islandora_libraries_bck/* cp -a sites/all/modules/islandora/* ~/islandora_modules_bck/ cp -a sites/all/libraries/* ~/islandora_libraries_bck/ NOTE: all Islandora modules installed in sites/all/modules/islandora/ \\ * Disable modules (3) drush dis islandora_solr_metadata drush dis islandora_solr drush dis islandora_basic_collection islandora_book islandora_compound_object islandora_large_image drush dis islandora_ocr islandora_xacml_editor islandora_internet_archive_bookreader islandora_openseadragon drush dis islandora_paged_content islandora_xacml_api drush dis islandora \\ * Update libraries - openseadragon cd ~ wget https://github.com/openseadragon/openseadragon/releases/download/v1.1.1/openseadragon-bin-1.1.1.tar.gz tar -xvzf openseadragon-bin-1.1.1.tar.gz rm -R /usr/share/siteRoot/sites/all/libraries/openseadragon mv openseadragon-bin-1.1.1 /usr/share/siteRoot/sites/all/libraries/openseadragon - bookreader cd /usr/share/siteRoot/sites/all/libraries/ rm -R bookreader git clone https://github.com/Islandora/internet_archive_bookreader.git mv internet_archive_bookreader bookreader - tuque cd /usr/share/siteRoot/sites/all/libraries/ rm -R tuque git clone https://github.com/Islandora/tuque.git nano -w tuque/HttpConnection.php public $verifyPeer = FALSE; - colorbox library plugin cd /usr/share/siteRoot/sites/all/libraries/ rm -R colorbox wget https://github.com/jackmoore/colorbox/archive/master.zip unzip master.zip rm master.zip mv colorbox-master colorbox - JAIL cd /usr/share/siteRoot/sites/all/libraries/ rm -R JAIL git clone git://github.com/sebarmeli/JAIL \\ * Update modules cd /usr/share/siteRoot/sites/all/modules/islandora/ - islandora rm -R islandora git clone git://github.com/Islandora/islandora drush en islandora - islandora_xacml_editor rm -R islandora_xacml_editor git clone git://github.com/Islandora/islandora_xacml_editor drush en islandora_xacml_api drush en islandora_xacml_editor - islandora_paged_content rm -R islandora_paged_content git clone git://github.com/Islandora/islandora_paged_content drush en islandora_paged_content - islandora_openseadragon rm -R islandora_openseadragon git clone git://github.com/Islandora/islandora_openseadragon.git drush en islandora_openseadragon - islandora_internet_archive_bookreader rm -R islandora_internet_archive_bookreader git clone git://github.com/Islandora/islandora_internet_archive_bookreader nano -w islandora_internet_archive_bookreader/includes/callback.inc if (!module_exists('islandora_solr')) { drupal_exit(); } + $term = "OCR_t:".$term; $results = islandora_paged_content_perform_solr_highlighting_query($term, array( 'fq' => array(format_string('!field:("info:fedora/!value" OR "!value")', array( '!field' => variable_get('islandora_internet_archive_bookreader_ocr_filter_field', 'RELS_EXT_isMemberOf_uri_ms'), '!value' => $object_id, ))), 'hl.tag.pre' => '{{{', 'hl.tag.post' => '}}}', - 'defType' => 'dismax', nano -w islandora_internet_archive_bookreader/theme/theme.inc - if ($viewer != 'dublin_core' && $metadata) { + if (($viewer == 'dublin_core') && ($metadata)) { drush en islandora_internet_archive_bookreader - islandora_ocr rm -R islandora_ocr git clone git://github.com/Islandora/islandora_ocr drush en islandora_ocr - islandora_solution_pack_collection rm -R islandora_solution_pack_collection git clone git://github.com/Islandora/islandora_solution_pack_collection drush en islandora_basic_collection REINSTALL OBJECT Islandora Collection Content Model [islandora:collectionCModel] \\ \\ - islandora_solution_pack_large_image rm -R islandora_solution_pack_large_image git clone git://github.com/Islandora/islandora_solution_pack_large_image drush en islandora_large_image REINSTALL OBJECT Islandora Large Image Content Model [islandora:sp_large_image_cmodel] \\ Large Image Collection [islandora:sp_large_image_collection] \\ NOTE: viewer doesn't work in maintenance mode \\ \\ - islandora_solution_pack_compound rm -R islandora_solution_pack_compound git clone git://github.com/Islandora/islandora_solution_pack_compound drush en islandora_compound_object REINSTALL OBJECT Compound Collection [islandora:compound_collection] \\ \\ - islandora_solution_pack_book rm -R islandora_solution_pack_book git clone git://github.com/Islandora/islandora_solution_pack_book drush en islandora_book REINSTALL OBJECT Islandora Internet Archive Book Content Model [islandora:bookCModel] \\ Book Collection [islandora:bookCollection] \\ \\ - islandora_solr_search rm -R islandora_solr_search git clone git://github.com/Islandora/islandora_solr_search wget http://solr-php-client.googlecode.com/files/SolrPhpClient.r60.2011-05-04.zip unzip SolrPhpClient.r60.2011-05-04.zip cp -R SolrPhpClient/Apache/Solr/* islandora_solr_search/SolrPhpClient/Apache/Solr/ rm -R SolrPhpClient* drush en islandora_solr - islandora_solr_metadata rm -R islandora_solr_metadata git clone git://github.com/Islandora/islandora_solr_metadata drush en islandora_solr_metadata - php_lib rm -R php_lib git clone git://github.com/Islandora/php_lib - objective_forms rm -R objective_forms git clone git://github.com/Islandora/objective_forms - islandora_xml_forms rm -R islandora_xml_forms git clone git://github.com/Islandora/islandora_xml_forms