Changeset 32875

Show
Ignore:
Timestamp:
07.03.2019 23:21:38 (4 months ago)
Author:
davidb
Message:

info.json now works

Location:
gs3-extensions/iiif-servlet/trunk/src
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • gs3-extensions/iiif-servlet/trunk/src/gsdl-src/java/org/greenstone/gsdl3/IIIFServerBridge.java

    r32874 r32875  
    223223 
    224224                System.err.println("*** metadata_list_elem = " + XMLConverter.getPrettyString(metadata_list_elem)); 
    225                 String assocfilepath_metadata = GSXML.getMetadataValue(metadata_list_elem,"assocfilepath"); 
    226                 String image_metadata = GSXML.getMetadataValue(metadata_list_elem,"Image"); 
    227                 //Node assocfilepath_metadata_node = GSXML.getChildByTagName("assocfilepath"); 
    228                 //Node image_metadata_node = GSXML.getChildByTagName("Image"); 
    229  
    230                 result = assocfilepath_metadata + "/" + image_metadata; 
     225 
     226                Element assocfilepath_metadata_elem = (Element)GSXML.getChildByTagName(metadata_list_elem,"assocfilepath"); 
     227                String assocfilepath_metadata_val = GSXML.getNodeText(assocfilepath_metadata_elem); 
     228 
     229                Element image_metadata_elem = (Element)GSXML.getChildByTagName(metadata_list_elem,"Image"); 
     230                String image_metadata_val = GSXML.getNodeText(image_metadata_elem); 
     231 
     232                result = assocfilepath_metadata_val + "/" + image_metadata_val; 
    231233            } 
    232234 
  • gs3-extensions/iiif-servlet/trunk/src/src/main/java/edu/illinois/library/cantaloupe/resource/iiif/v2/GSInformationResource.java

    r32874 r32875  
    107107    //System.err.println("**** gs_message = " + XMLConverter.getPrettyString(gs_message_elem)); 
    108108    System.err.println("**** Greenstone site image filename = " + site_image_filename); 
    109      
    110         final Source source = new SourceFactory().newSource( 
    111                 identifier, getDelegateProxy()); 
    112  
    113     System.err.println("***** identifier = " + identifier); 
     109 
     110    final Identifier identifier_image = new Identifier(site_image_filename); 
     111 
     112        //final Source source = new SourceFactory().newSource(identifier, getDelegateProxy()); 
     113    final Source source = new SourceFactory().newSource(identifier_image, getDelegateProxy()); 
     114         
     115    System.err.println("***** identifier_image = " + identifier_image); 
    114116    System.err.println("***** source path = " + ((edu.illinois.library.cantaloupe.source.FileSource)source).getPath()); 
    115117