svn commit: r1865633 - /manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java

[kwright]

Author: kwright
Date: Wed Aug 21 16:10:00 2019
New Revision: 1865633

URL: http://svn.apache.org/viewvc?rev=1865633&view=rev
Log:
Get rid of code that expects a volume ID

Modified:
    
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java

Modified: 
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java?rev=1865633&r1=1865632&r2=1865633&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java
 Wed Aug 21 16:10:00 2019
@@ -697,12 +697,7 @@ public class CswsConnector extends org.a
     // The document identifier is the string form of the object ID for this 
connector.
     if (!documentIdentifier.startsWith("D"))
       return null;
-    String objectID = null;
-    int colonPosition = documentIdentifier.indexOf(":",1);
-    if (colonPosition == -1)
-      objectID = documentIdentifier.substring(1);
-    else
-      objectID = documentIdentifier.substring(colonPosition+1);
+    final String objectID = documentIdentifier.substring(1);
     String viewURL = null;
     switch(viewAction)
     {
@@ -2701,13 +2696,8 @@ public class CswsConnector extends org.a
     String resultCode = null;
     String resultDescription = null;
     Long readSize = null;
-    long objID;
-    long vol;
 
-    int colonPos = documentIdentifier.indexOf(":",1);
-        
-    objID = new Integer(documentIdentifier.substring(colonPos+1)).intValue();
-    vol = new Integer(documentIdentifier.substring(1,colonPos)).intValue();
+    long objID = new Integer(documentIdentifier.substring(1)).intValue();
     
     // Try/finally for fetch logging
     try
@@ -3010,7 +3000,7 @@ public class CswsConnector extends org.a
     finally
     {
       if (resultCode != null)
-        activities.recordActivity(new 
Long(startTime),ACTIVITY_FETCH,readSize,vol+":"+objID,resultCode,resultDescription,null);
+        activities.recordActivity(new 
Long(startTime),ACTIVITY_FETCH,readSize,new 
Long(objID).toString(),resultCode,resultDescription,null);
     }
   }