Author: kwright
Date: Sat Jul 6 23:33:06 2019
New Revision: 1862673
URL: http://svn.apache.org/viewvc?rev=1862673&view=rev
Log:
More work
Modified:
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/GetConnectionInfo.java
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.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=1862673&r1=1862672&r2=1862673&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
Sat Jul 6 23:33:06 2019
@@ -3599,13 +3599,13 @@ public class CswsConnector extends org.a
public String getName()
throws ServiceInterruption, ManifoldCFException
{
- final User userValue = getUserValue();
+ final Member userValue = getUserValue();
if (userValue == null)
return null;
return userValue.getName();
}
- protected User getUserValue()
+ protected Member getUserValue()
throws ServiceInterruption, ManifoldCFException
{
if (!fetched)
@@ -4011,7 +4011,7 @@ public class CswsConnector extends org.a
final Node elem = getObjectValue();
if (elem == null)
return null;
- return new elem.getPermissions();
+ return elem.getPermissions();
}
/** Get OpenText document name.
@@ -4270,7 +4270,7 @@ public class CswsConnector extends org.a
{
protected final long user;
protected Throwable exception = null;
- protected User rval = null;
+ protected Member rval = null;
public GetUserInfoThread(long user)
{
@@ -4283,7 +4283,7 @@ public class CswsConnector extends org.a
{
try
{
- rval = cswsSession.getUser(user);
+ rval = cswsSession.getMember(user);
}
catch (Throwable e)
{
@@ -4291,7 +4291,7 @@ public class CswsConnector extends org.a
}
}
- public User finishUp()
+ public Member finishUp()
throws ManifoldCFException, ServiceInterruption, InterruptedException
{
join();
@@ -5266,12 +5266,12 @@ public class CswsConnector extends org.a
// Get the parentID attribute
if (currentObject.getParentId() == null) {
- long parentID = currentObject.getParentId().longValue();
// Oops, hit the top of the path without finding the workspace we're
in.
// No idea where it lives; note this condition and exit.
Logging.connectors.warn("Csws: Object ID
"+currentObject.toString()+" doesn't seem to live in enterprise or category
workspace! Path I got was '"+path+"'");
return null;
}
+ long parentID = currentObject.getParentId().longValue();
currentObject = llc.getObjectInformation(parentID);
}
}
Modified:
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/GetConnectionInfo.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/GetConnectionInfo.java?rev=1862673&r1=1862672&r2=1862673&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/GetConnectionInfo.java
(original)
+++
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/GetConnectionInfo.java
Sat Jul 6 23:33:06 2019
@@ -24,6 +24,8 @@ import org.apache.manifoldcf.crawler.int
import org.apache.manifoldcf.crawler.system.Logging;
import org.apache.manifoldcf.crawler.system.ManifoldCF;
+import org.apache.manifoldcf.csws.CswsParameters;
+
/** Get a livelink connection's information in printed form.
*/
public class GetConnectionInfo
Modified:
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java?rev=1862673&r1=1862672&r2=1862673&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
(original)
+++
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
Sat Jul 6 23:33:06 2019
@@ -304,10 +304,10 @@ public class CswsSession
}
}
- public AttributeGroupDefinition getCategoryDefinition(final long catId,
final long version)
+ public AttributeGroupDefinition getCategoryDefinition(final long catId)
throws ManifoldCFException, ServiceInterruption {
try {
- return getDocumentManagementHandle().getCategoryDefinition(catId,
version, getOTAuthentication());
+ return getDocumentManagementHandle().getCategoryDefinition(catId,
getOTAuthentication());
} catch (SOAPFaultException e) {
processSOAPFault(e);
}
