From 44593ca856283ff17d20fe40830a920b132aa4f0 Mon Sep 17 00:00:00 2001 From: Alexander O'Neill Date: Wed, 12 Jun 2019 13:34:50 -0300 Subject: [PATCH 1/5] Test commit to test packagist hook. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 11ebab87..88ad1c47 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "drupal/islandora_fits", "type": "drupal-module", - "description": "Enables Technical Metadata derivative generation", + "description": "Enables Technical Metadata derivative generation.", "keywords": ["Drupal"], "license": "GPL-2.0+", "homepage": "https://www.drupal.org/project/islandora_fits", From 252aa5bfee9b932f50e81d953806b1336dabc488 Mon Sep 17 00:00:00 2001 From: Alexander O'Neill Date: Wed, 12 Jun 2019 16:21:59 -0300 Subject: [PATCH 2/5] Change package namespace to roblib. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 88ad1c47..0733fe96 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "drupal/islandora_fits", + "name": "roblib/islandora_fits", "type": "drupal-module", "description": "Enables Technical Metadata derivative generation.", "keywords": ["Drupal"], From 1bcc08a1b5c447ad5a4f11221c90f0d30fd7ee5c Mon Sep 17 00:00:00 2001 From: Alexander O'Neill Date: Thu, 13 Jun 2019 10:41:47 -0300 Subject: [PATCH 3/5] Chaning composer namespace to 'islandora-rdm'. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0733fe96..9793e0be 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "roblib/islandora_fits", + "name": "islandora-rdm/islandora_fits", "type": "drupal-module", "description": "Enables Technical Metadata derivative generation.", "keywords": ["Drupal"], From 2e06a4f3efee9342659f76a4717437d366468bb7 Mon Sep 17 00:00:00 2001 From: Alan Stanley Date: Thu, 13 Jun 2019 13:33:09 -0300 Subject: [PATCH 4/5] Update README.md --- README.md | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/README.md b/README.md index dd55720d..6a63b889 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,39 @@ # Islandora FITS Config module to make Islandora aware of FITS microservice + +##Installation +#### Install this module +Install and enable this module in the usual way + + +####Install FITS Webservice +FITS xmls are generated from an easily installed web service. +Get the latest fits.zip and fits.war from https://projects.iq.harvard.edu/fits/downloads +(on my box I had to install a missing zip library with ‘sudo apt-get install php7.1-zip’) + +Install following their instructions. +Copy the .war file to your webapps directory and test. +Edit the catalina.properties file on the Drupal server by adding the following two lines to the bottom of the file- + +fits.home=//fits +shared.loader=//fits/lib/*.jar + +Restart Tomcat and test with + +`curl -k -F datafile="@/path/to/myfile.jpg" http://example.com:8080/fits/examine` +(note: the ‘@’ is required.) + +####Installing Microservice +Get code from https://github.com/roblib/CrayFits and install. This code can live anywhere, including an external server, +but most installations will have it at /var/www/html. + +The App runs by entering php bin/console server:start *:8050 in the App root folder. +The server is stopped with php bin/console server:stop. On a production machine you'd probably want to configure an additonal port in Apache. + + +Note: The location of the fits webserver is stored in the .env file in the root dir of the Symfony app. This will have to be reconfigured if the Fits server is anywhere other than localhost:8080/fits + +#### Adding FITs requests to the queue +Copy the file `assets/ca.islandora.alpaca.connector.ocr.blueprint.xml` to `/opt/karak/deploy` on your server. There is no need to restart. + + From e2f55cc7314e55aa45c8e462ef0846fd5e309d9a Mon Sep 17 00:00:00 2001 From: Alan Stanley Date: Thu, 13 Jun 2019 13:34:36 -0300 Subject: [PATCH 5/5] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6a63b889..9524bf04 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # Islandora FITS Config module to make Islandora aware of FITS microservice -##Installation +## Installation #### Install this module Install and enable this module in the usual way -####Install FITS Webservice +#### Install FITS Webservice FITS xmls are generated from an easily installed web service. Get the latest fits.zip and fits.war from https://projects.iq.harvard.edu/fits/downloads (on my box I had to install a missing zip library with ‘sudo apt-get install php7.1-zip’) @@ -23,7 +23,7 @@ Restart Tomcat and test with `curl -k -F datafile="@/path/to/myfile.jpg" http://example.com:8080/fits/examine` (note: the ‘@’ is required.) -####Installing Microservice +#### Installing Microservice Get code from https://github.com/roblib/CrayFits and install. This code can live anywhere, including an external server, but most installations will have it at /var/www/html.