Changeset 32875 for gs3-extensions

Timestamp:

2019-03-07T23:21:38+13:00 (5 years ago)

Author:

davidb

Message:

info.json now works

Location:

gs3-extensions/iiif-servlet/trunk/src

Files:

• gsdl-src/java/org/greenstone/gsdl3/IIIFServerBridge.java (modified) (1 diff)
• src/main/java/edu/illinois/library/cantaloupe/resource/iiif/v2/GSInformationResource.java (modified) (1 diff)

gs3-extensions/iiif-servlet/trunk/src/gsdl-src/java/org/greenstone/gsdl3/IIIFServerBridge.java

@@ -223 +223 @@
 
                 System.err.println("*** metadata_list_elem = " + XMLConverter.getPrettyString(metadata_list_elem));
-                String assocfilepath_metadata = GSXML.getMetadataValue(metadata_list_elem,"assocfilepath");
-                String image_metadata = GSXML.getMetadataValue(metadata_list_elem,"Image");
-                //Node assocfilepath_metadata_node = GSXML.getChildByTagName("assocfilepath");
-                //Node image_metadata_node = GSXML.getChildByTagName("Image");
-
-                result = assocfilepath_metadata + "/" + image_metadata;
+
+                Element assocfilepath_metadata_elem = (Element)GSXML.getChildByTagName(metadata_list_elem,"assocfilepath");
+                String assocfilepath_metadata_val = GSXML.getNodeText(assocfilepath_metadata_elem);
+
+                Element image_metadata_elem = (Element)GSXML.getChildByTagName(metadata_list_elem,"Image");
+                String image_metadata_val = GSXML.getNodeText(image_metadata_elem);
+
+                result = assocfilepath_metadata_val + "/" + image_metadata_val;
             }
 

gs3-extensions/iiif-servlet/trunk/src/src/main/java/edu/illinois/library/cantaloupe/resource/iiif/v2/GSInformationResource.java

@@ -107 +107 @@
     //System.err.println("**** gs_message = " + XMLConverter.getPrettyString(gs_message_elem));
     System.err.println("**** Greenstone site image filename = " + site_image_filename);
-    
-        final Source source = new SourceFactory().newSource(
-                identifier, getDelegateProxy());
-
-    System.err.println("***** identifier = " + identifier);
+
+    final Identifier identifier_image = new Identifier(site_image_filename);
+
+        //final Source source = new SourceFactory().newSource(identifier, getDelegateProxy());
+    final Source source = new SourceFactory().newSource(identifier_image, getDelegateProxy());
+        
+    System.err.println("***** identifier_image = " + identifier_image);
     System.err.println("***** source path = " + ((edu.illinois.library.cantaloupe.source.FileSource)source).getPath());