Changeset 26171 for other-projects/gs3-webservices-java-client

Timestamp:

2012-09-11T16:22:31+12:00 (12 years ago)

Author:

ak19

Message:

Uncommitted changes from ages back to fedoraGS3 classes to get greenstone to work as an interface to fedora repository backend.

Location:

other-projects/gs3-webservices-java-client/trunk/src

Files:

• GS3DemoClient/org/greenstone/gs3client/dlservices/FedoraServicesAPIA.java (modified) (1 diff)
• GS3Fedora/org/greenstone/fedora/services/FedoraConnection.java (modified) (1 diff)
• GS3Fedora/org/greenstone/fedora/services/FedoraGS3Connection.java (modified) (2 diffs)
• GS3Fedora/org/greenstone/fedora/services/FedoraGS3DL.java (modified) (1 diff)
• GS3Fedora/org/greenstone/fedora/services/FedoraGS3Exception.java (modified) (1 diff)
• GS3Fedora/org/greenstone/fedora/services/FedoraToGS3Interface.java (modified) (1 diff)

other-projects/gs3-webservices-java-client/trunk/src/GS3DemoClient/org/greenstone/gs3client/dlservices/FedoraServicesAPIA.java

@@ -242 +242 @@
         return this.browseMetadataRetrieve(nodeIDs, metafields);
     }
+    
+       
+    // FOR NOW, add the new method that converts URLs to document identifiers(PIDs) here,
+    // since it is not used by GS3 classes
+    public String getDocIDforURL(String url, String collection) {
+    return this.getPIDforURL(url, collection);
+    }
     
 }

other-projects/gs3-webservices-java-client/trunk/src/GS3Fedora/org/greenstone/fedora/services/FedoraConnection.java

@@ -984 +984 @@
     }
     
+
+    /** Used to obtain the dc:title value (hashID) of the DC stream of a digital
+     * object whose fedoraID is of a special sort: greenstone-http:<colname>-id. */
+    protected String getDCTitle(String fedoraPID) 
+    throws RemoteException, UnsupportedEncodingException, 
+            SAXException, IOException
+    {
+    String title = "";
+    MIMETypedStream dcdata = APIA.getDatastreamDissemination(fedoraPID, DC, null);
+    if(dcdata == null || dcdata.equals("")) {
+        return title;
+    }
+    String dcStream = new String(dcdata.getStream(), UTF8);
+    
+    InputSource source = new InputSource(new StringReader(dcStream));
+    Document doc = builder.parse(source);
+    Element docEl = doc.getDocumentElement(); // docEl=<oai_dc:dc></oai_dc:dc>
+    NodeList children = docEl.getElementsByTagName("dc:title");
+    if(children != null && children.getLength() > 0) {
+        Node n = children.item(0); // <dc:title>
+        Element e = (Element)n;
+        title = FedoraCommons.getValue(e);
+    }
+    return title;
+    }
+
     /** @return the title metadata for the given document sections. 
      * These titles are returned in the same order as the given docPIDs

other-projects/gs3-webservices-java-client/trunk/src/GS3Fedora/org/greenstone/fedora/services/FedoraGS3Connection.java

@@ -455 +455 @@
             // <documentNodeList>
         
-        // <documentNode nodeID="docID"> - the docNode on which a structure  
+        // <documentNode nodeID="docID"> - the docNode on which a metadata
         // retrieve is being performed
         Element docNode = doc.createElement(GSXML.DOC_NODE_ELEM);
@@ -2352 +2352 @@
         }
     }
+
+    
+    // FOR NOW, add the new method that converts URLs to document identifiers(PIDs)
+    /** Given a URL that represents a fedoraPID, will look up the object.
+     * If it exists, it will return the contents of the DC:Title of its datastream.
+     * If it doesn't exist, it will return the URL as-is.
+     * @param URL: the URL that (after modification) represents a fedoraPID to look up.
+     * @param collection: the name of collection in which to search for the URL
+     * representing a fedoraPID.
+     * @return the string (representing a fedoraPID) stored in the DC:Title of the
+     * URL-fedoraPID. If the URL-fedoraPID is not an object in the given collection,
+     * then the parameter URL is returned.
+    */
+    public String getPIDforURL(String url, String collection) {
+    FedoraGS3RunException ex = null; // any RemoteException
+
+    // (1) convert url to the fedorapid
+    // / -> _ and : -> -
+    String fedoraPID = url.replaceAll("/", "_");
+    fedoraPID = fedoraPID.replaceAll(":", "-");
+    // prefix "greenstone-http:<colname>-" to the fedoraPID
+    fedoraPID = GREENSTONE+_HTTP+COLON+collection+HYPHEN+fedoraPID;
+    //LOG.error("### fedoraPID: " + fedoraPID);
+
+    // (2) Look up the datastream for the fedorapid
+    String dcTitle = "";
+    try {
+        dcTitle = getDCTitle(fedoraPID);
+    } catch(Exception e) {
+        LOG.error("Error retrieving dcTitle for PID " + fedoraPID + ": " + e);
+        ex = new FedoraGS3RunException("When trying to retrieve dc:title for URL: " + url, e);
+    }
+    //String dc = this.getDC(fedoraPID);
+    //LOG.error("### document ID (in dcTitle) found is: " + dcTitle);
+
+    // (3) if fedorapid exists, extract the dc:title content.
+    // if it doesn't exist, return url
+    if(dcTitle.equals("")) {        
+        return url;
+    } else {
+        // It represents a fedoraPID of its own, so prefix fedora namespace and return it.
+        //return GREENSTONE+COLON+collection+HYPHEN+dcTitle; // NO. Handled in g2f-buildcol.pl
+        return dcTitle+"-1";
+    }
+    }
     
     public static void main(String args[]) {

other-projects/gs3-webservices-java-client/trunk/src/GS3Fedora/org/greenstone/fedora/services/FedoraGS3DL.java

@@ -54 +54 @@
     public static final String COLLECTION = "collection";
     public static final String _COLLECTION = "-"+COLLECTION;
+    public static final String _HTTP = "-http";
     
     public static final String WILDCARD = "*";

other-projects/gs3-webservices-java-client/trunk/src/GS3Fedora/org/greenstone/fedora/services/FedoraGS3Exception.java

@@ -201 +201 @@
                     msg = " " + msg + ". ";
             }
+            
+            LOG.error("### ERROR");
+            LOG.error(msg, cause);
             return this.getClass().getCanonicalName() 
                 + msg + super.getMessage();

other-projects/gs3-webservices-java-client/trunk/src/GS3Fedora/org/greenstone/fedora/services/FedoraToGS3Interface.java

@@ -296 +296 @@
     public String query(String collection, String service, 
             Map nameValParamsMap); 
+
+    
+    /** Given a URL that represents a fedoraPID, will look up the object.
+     * If it exists, it will return the contents of the DC:Title of its datastream.
+     * If it doesn't exist, it will return the URL as-is.
+     * @param URL: the URL that (after modification) represents a fedoraPID to look up.
+     * @param collection: the name of collection in which to search for the URL
+     * representing a fedoraPID.
+     * @return the string (representing a fedoraPID) stored in the DC:Title of the
+     * URL-fedoraPID. If the URL-fedoraPID is not an object in the given collection,
+     * then the parameter URL is returned.
+    */
+    public String getPIDforURL(String url, String collection);
 }