Changeset 21864

Timestamp:

2010-04-09T13:48:44+12:00 (14 years ago)

Author:

ak19

Message:

Related fix to yesterday's. Deals with possible decimal point in classifier IDs.

Location:

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

Files:

• lib/fedoraGS3.jar (modified) ( previous)
• src/GS3Fedora/org/greenstone/fedora/services/FedoraGS3Connection.java (modified) (2 diffs)

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

@@ -1741 +1741 @@
         int decimal = classifier.indexOf('.'); // look for decimal point
         if(decimal != -1) {
-            classifier.substring(0, decimal);
+            classifier = classifier.substring(0, decimal);
         }
         int classifierNum = Integer.parseInt(classifier);
@@ -1819 +1819 @@
         
         // create <classifierNode><metadataList><metadata>s
-        // </metadataList></classifierNode> for all letters of alphabet
+        // </metadataList></classifierNode> for all letters of the alphabet
         for(int i = 0; i < classNodeIDs.length; i++) {
             // strip ID of everything before the first '.' (i.e. remove "CL#.")
             int index = classNodeIDs[i].indexOf('.');
             String subClassifierNumber = classNodeIDs[i].substring(index+1);
+            index = subClassifierNumber.indexOf('.'); // find next decimal point, if any
+            if(index != -1) {
+                subClassifierNumber = subClassifierNumber.substring(0, index);
+            }
             int subClassifierNum = Integer.parseInt(subClassifierNumber);
             String classifierName = "";