You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/10/30 22:52:58 UTC
svn commit: r1635625 - in
/manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main:
java/org/apache/manifoldcf/crawler/connectors/jdbc/
java/org/apache/manifoldcf/jdbc/
native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/
Author: kwright
Date: Thu Oct 30 21:52:58 2014
New Revision: 1635625
URL: http://svn.apache.org/r1635625
Log:
Add new aclquery to UI
Modified:
manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/jdbc/JDBCConstants.java
manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_en_US.properties
manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_ja_JP.properties
manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_zh_CN.properties
Modified: manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java?rev=1635625&r1=1635624&r2=1635625&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java (original)
+++ manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java Thu Oct 30 21:52:58 2014
@@ -1184,7 +1184,8 @@ public class JDBCConnector extends org.a
String idQuery = "SELECT idfield AS $(IDCOLUMN) FROM documenttable WHERE modifydatefield > $(STARTTIME) AND modifydatefield <= $(ENDTIME)";
String versionQuery = "SELECT idfield AS $(IDCOLUMN), versionfield AS $(VERSIONCOLUMN) FROM documenttable WHERE idfield IN $(IDLIST)";
String dataQuery = "SELECT idfield AS $(IDCOLUMN), urlfield AS $(URLCOLUMN), datafield AS $(DATACOLUMN) FROM documenttable WHERE idfield IN $(IDLIST)";
-
+ String aclQuery = "SELECT docidfield AS $(IDCOLUMN), aclfield AS $(ACCESSTOKENCOLUMN) FROM acltable WHERE docidfield IN $(IDLIST)";
+
int i = 0;
while (i < ds.getChildCount())
{
@@ -1207,6 +1208,12 @@ public class JDBCConnector extends org.a
if (dataQuery == null)
dataQuery = "";
}
+ else if (sn.getType().equals(JDBCConstants.aclQueryNode))
+ {
+ aclQuery = sn.getValue();
+ if (aclQuery == null)
+ aclQuery = "";
+ }
}
// The Queries tab
@@ -1225,6 +1232,10 @@ public class JDBCConnector extends org.a
" <td class=\"value\"><textarea name=\""+seqPrefix+"versionquery\" cols=\"64\" rows=\"6\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(versionQuery)+"</textarea></td>\n"+
" </tr>\n"+
" <tr>\n"+
+" <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"JDBCConnector.AccessTokenQuery") + "</nobr><br/><nobr>" + Messages.getBodyString(locale,"JDBCConnector.returnIdsAndAccessTokensForASetOfDocuments") + "</nobr><br/><nobr>" + Messages.getBodyString(locale,"JDBCConnector.leaveBlankIfNoSecurityCapability") + "</nobr></td>\n"+
+" <td class=\"value\"><textarea name=\""+seqPrefix+"aclquery\" cols=\"64\" rows=\"6\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(aclQuery)+"</textarea></td>\n"+
+" </tr>\n"+
+" <tr>\n"+
" <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"JDBCConnector.DataQuery") + "</nobr><br/><nobr>" + Messages.getBodyString(locale,"JDBCConnector.returnIdsUrlsAndDataForASetOfDocuments") + "</nobr></td>\n"+
" <td class=\"value\"><textarea name=\""+seqPrefix+"dataquery\" cols=\"64\" rows=\"6\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(dataQuery)+"</textarea></td>\n"+
" </tr>\n"+
@@ -1236,6 +1247,7 @@ public class JDBCConnector extends org.a
out.print(
"<input type=\"hidden\" name=\""+seqPrefix+"idquery\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(idQuery)+"\"/>\n"+
"<input type=\"hidden\" name=\""+seqPrefix+"versionquery\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(versionQuery)+"\"/>\n"+
+"<input type=\"hidden\" name=\""+seqPrefix+"aclquery\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(aclQuery)+"\"/>\n"+
"<input type=\"hidden\" name=\""+seqPrefix+"dataquery\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(dataQuery)+"\"/>\n"
);
}
@@ -1349,7 +1361,8 @@ public class JDBCConnector extends org.a
String idQuery = variableContext.getParameter(seqPrefix+"idquery");
String versionQuery = variableContext.getParameter(seqPrefix+"versionquery");
String dataQuery = variableContext.getParameter(seqPrefix+"dataquery");
-
+ String aclQuery = variableContext.getParameter(seqPrefix+"aclquery");
+
SpecificationNode sn;
if (idQuery != null)
{
@@ -1379,6 +1392,20 @@ public class JDBCConnector extends org.a
sn.setValue(versionQuery);
ds.addChild(ds.getChildCount(),sn);
}
+ if (aclQuery != null)
+ {
+ int i = 0;
+ while (i < ds.getChildCount())
+ {
+ if (ds.getChild(i).getType().equals(JDBCConstants.aclQueryNode))
+ ds.removeChild(i);
+ else
+ i++;
+ }
+ sn = new SpecificationNode(JDBCConstants.aclQueryNode);
+ sn.setValue(aclQuery);
+ ds.addChild(ds.getChildCount(),sn);
+ }
if (dataQuery != null)
{
int i = 0;
Modified: manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/jdbc/JDBCConstants.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/jdbc/JDBCConstants.java?rev=1635625&r1=1635624&r2=1635625&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/jdbc/JDBCConstants.java (original)
+++ manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/jdbc/JDBCConstants.java Thu Oct 30 21:52:58 2014
@@ -45,6 +45,8 @@ public class JDBCConstants
public static String versionQueryNode = "versionquery";
/** The node containing the process query */
public static String dataQueryNode = "dataquery";
+ /** The node containing the acl query */
+ public static String aclQueryNode = "aclquery";
/** The name of the id return column */
public static String idReturnColumnName = "lcf__id";
Modified: manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_en_US.properties?rev=1635625&r1=1635624&r2=1635625&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_en_US.properties (original)
+++ manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_en_US.properties Thu Oct 30 21:52:58 2014
@@ -55,3 +55,6 @@ JDBCConnector.SeedingQuery=Seeding query
JDBCConnector.VersionCheckQuery=Version check query:
JDBCConnector.DataQuery=Data query:
JDBCConnector.AccessTokens=Access tokens:
+JDBCConnector.AccessTokenQuery=Access token query:
+JDBCConnector.returnIdsAndAccessTokensForASetOfDocuments=(return ids and access tokens for a set of documents;
+JDBCConnector.leaveBlankIfNoSecurityCapability=leave blank if no security capability)
Modified: manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_ja_JP.properties?rev=1635625&r1=1635624&r2=1635625&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_ja_JP.properties (original)
+++ manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_ja_JP.properties Thu Oct 30 21:52:58 2014
@@ -55,3 +55,6 @@ JDBCConnector.SeedingQuery=ã·ã¼�
JDBCConnector.VersionCheckQuery=ãã¼ã¸ã§ã³ãã§ãã¯ã¯ã¨ãªã¼ï¼
JDBCConnector.DataQuery=ãã¼ã¿ã¯ã¨ãªã¼ï¼
JDBCConnector.AccessTokens=ã¢ã¯ã»ã¹ãã¼ã¯ã³ï¼
+JDBCConnector.AccessTokenQuery=Access token query:
+JDBCConnector.returnIdsAndAccessTokensForASetOfDocuments=(return ids and access tokens for a set of documents;
+JDBCConnector.leaveBlankIfNoSecurityCapability=leave blank if no security capability)
Modified: manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_zh_CN.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_zh_CN.properties?rev=1635625&r1=1635624&r2=1635625&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_zh_CN.properties (original)
+++ manifoldcf/branches/CONNECTORS-1089/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_zh_CN.properties Thu Oct 30 21:52:58 2014
@@ -55,3 +55,6 @@ JDBCConnector.SeedingQuery=æç§�
JDBCConnector.VersionCheckQuery=çæ¬æ£æ¥æ¥è¯¢:
JDBCConnector.DataQuery=æ°æ®æ¥è¯¢:
JDBCConnector.AccessTokens=访é®ä»¤ç:
+JDBCConnector.AccessTokenQuery=Access token query:
+JDBCConnector.returnIdsAndAccessTokensForASetOfDocuments=(return ids and access tokens for a set of documents;
+JDBCConnector.leaveBlankIfNoSecurityCapability=leave blank if no security capability)