svn commit: r1866858 - /manifoldcf/trunk/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java

[kw...@apache.org]

Author: kwright
Date: Thu Sep 12 16:01:17 2019
New Revision: 1866858

URL: http://svn.apache.org/viewvc?rev=1866858&view=rev
Log:
Go to the new ID format in one place I missed

Modified:
    manifoldcf/trunk/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java

Modified: manifoldcf/trunk/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java?rev=1866858&r1=1866857&r2=1866858&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java (original)
+++ manifoldcf/trunk/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java Thu Sep 12 16:01:17 2019
@@ -2600,17 +2600,6 @@ public class CswsConnector extends org.a
     throws ManifoldCFException, ServiceInterruption
   {
     return new String[]{categoryWSName, enterpriseWSName};
-    /*
-    getSession();
-    final Set<String> workspaceNames = workspaceNodes.keySet();
-    final String[] rval = new String[workspaceNames.size()];
-    int i = 0;
-    for (final String name : workspaceNames) {
-      rval[i++] = name;
-    }
-    java.util.Arrays.sort(rval);
-    return rval;
-    */
   }
 
   /** Given a path string, get a list of folders and projects under that node.
@@ -4952,13 +4941,10 @@ public class CswsConnector extends org.a
           identifierPart = identifierPart.substring(1);
         }
         // See if there's a volume label; if not, use the default.
-        int colonPosition = identifierPart.indexOf(":");
-        long volumeID;
         long objectID;
         try
         {
-          volumeID = Integer.parseInt(identifierPart.substring(0,colonPosition));
-          objectID = Integer.parseInt(identifierPart.substring(colonPosition+1));
+          objectID = Integer.parseInt(identifierPart);
         }
         catch (NumberFormatException e)
         {
@@ -4981,7 +4967,7 @@ public class CswsConnector extends org.a
           path = name;
         } else {
           long parentID = objInfo.getParentId().longValue();
-          String parentIdentifier = "F"+volumeID+":"+parentID;
+          String parentIdentifier = "F"+parentID;
           String parentPath = getNodePathString(parentIdentifier);
           if (parentPath == null)
             return null;