svn commit: r1742941 - in /manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main: java/org/apache/manifoldcf/crawler/connectors/jdbc/ native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/

[kw...@apache.org]

Author: kwright
Date: Mon May  9 12:50:48 2016
New Revision: 1742941

URL: http://svn.apache.org/viewvc?rev=1742941&view=rev
Log:
Some debugging

Modified:
    manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
    manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_en_US.properties
    manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_es_ES.properties
    manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_ja_JP.properties
    manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_zh_CN.properties

Modified: manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java?rev=1742941&r1=1742940&r2=1742941&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java (original)
+++ manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java Mon May  9 12:50:48 2016
@@ -1176,7 +1176,7 @@ public class JDBCConnector extends org.a
 "  "+seqPrefix+"SpecOp(\""+seqPrefix+"attr_\"+index+\"_op\", \"Delete\", \""+seqPrefix+"attr_\" + index);\n"+
 "}\n"+
 "\n"+
-"function "+seqPrefix+"AddAttr()\n"+
+"function "+seqPrefix+"AddAttr(index)\n"+
 "{\n"+
 "  if (editjob."+seqPrefix+"attr_name.value == \"\")\n"+
 "  {\n"+
@@ -1208,7 +1208,7 @@ public class JDBCConnector extends org.a
 "    editjob."+seqPrefix+"attr_query.focus();\n"+
 "    return;\n"+
 "  }\n"+
-"  "+seqPrefix+"SpecOp(\""+seqPrefix+"attr_op\", \"Add\", \""+seqPrefix+"attr\");\n"+
+"  "+seqPrefix+"SpecOp(\""+seqPrefix+"attr_op\", \"Add\", \""+seqPrefix+"attr_\"+(index+1));\n"+
 "}\n"+
 "\n"+
 "function "+seqPrefix+"SpecAddToken(anchorvalue)\n"+
@@ -1456,7 +1456,7 @@ public class JDBCConnector extends org.a
         // Query
         out.print(
 "          <td class=\"formcolumncell\">\n"+
-"            <textarea name=\""+seqPrefix+"attr_"+attributeIndex+"_query\" cols=\"64\" rows=\"6\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(dataQuery)+"</textarea>\n"+
+"            <textarea name=\""+seqPrefix+"attr_"+attributeIndex+"_query\" cols=\"64\" rows=\"6\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(attributeQuery)+"</textarea>\n"+
 "          </td>\n"
         );
         out.print(
@@ -1477,14 +1477,14 @@ public class JDBCConnector extends org.a
 "          <td class=\"formcolumncell\">\n"+
 "            <a name=\""+seqPrefix+"attr_"+attributeIndex+"\">\n"+
 "              <input type=\"button\" value=\""+Messages.getAttributeString(locale,"JDBCConnector.Add")+"\"\n"+
-"              alt=\""+Messages.getAttributeString(locale,"JDBCConnector.AddAttribute")+"\" onclick=\"javascript:"+seqPrefix+"AddAttr();\"/>\n"+
+"              alt=\""+Messages.getAttributeString(locale,"JDBCConnector.AddAttribute")+"\" onclick=\"javascript:"+seqPrefix+"AddAttr("+attributeIndex+");\"/>\n"+
 "            </a>\n"+
 "            <input type=\"hidden\" name=\""+seqPrefix+"attr_count\" value=\""+attributeIndex+"\"/>\n"+
 "            <input type=\"hidden\" name=\""+seqPrefix+"attr_op\" value=\"Continue\"/>\n"+
 "          </td>\n"+
-"          <td class=\"formcolumncell\"><nobr><input name=\""+seqPrefix+"attr_name\" type=\"text\" size=\"32\" value=\"\"/></nobr></td>\n"+
+"          <td class=\"formcolumncell\"><nobr><input name=\""+seqPrefix+"attr_name\" type=\"text\" size=\"16\" value=\"\"/></nobr></td>\n"+
 "          <td class=\"formcolumncell\">\n"+
-"            <textarea name=\""+seqPrefix+"attr_query\" cols=\"64\" rows=\"6\"></textarea>\n"+
+"            <textarea name=\""+seqPrefix+"attr_query\" cols=\"64\" rows=\"6\">SELECT idfield AS $(IDCOLUMN), datafield AS $(DATACOLUMN) FROM attributetable WHERE idfield IN $(IDLIST)</textarea>\n"+
 "          </td>\n"+
 "        </tr>\n"
       );
@@ -1743,7 +1743,7 @@ public class JDBCConnector extends org.a
       
       // Now, maybe do add
       final String newAttributeOp = variableContext.getParameter(seqPrefix+"attr_op");
-      if (newAttributeOp.equals("Add"))
+      if (newAttributeOp != null && newAttributeOp.equals("Add"))
       {
         final String attributeName = variableContext.getParameter(seqPrefix+"attr_name");
         final String attributeQuery = variableContext.getParameter(seqPrefix+"attr_query");

Modified: manifoldcf/branches/CONNECTORS-1313/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-1313/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_en_US.properties?rev=1742941&r1=1742940&r2=1742941&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_en_US.properties (original)
+++ manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_en_US.properties Mon May  9 12:50:48 2016
@@ -42,14 +42,14 @@ JDBCConnector.PleaseFillInADatabaseServe
 JDBCConnector.PleaseFillInTheNameOfTheDatabase=Please fill in the name of the database
 JDBCConnector.PleaseSupplyTheDatabaseUsernameForThisConnection=Please supply the database username for this connection
 JDBCConnector.EnterASeedingQuery=Enter a seeding query
-JDBCConnector.MustReturnIDCOLUMNInTheResult=Must return $(IDCOLUMN) in the result.\\nExample: SELECT idfield AS $(IDCOLUMN) FROM ...
-JDBCConnector.MustReturnVERSIONCOLUMNInTheResult=Must return $(VERSIONCOLUMN) in the result, containing the document version.\\nExample: SELECT versionfield AS $(VERSIONCOLUMN), ...
-JDBCConnector.MustUseIDLISTInWHEREClause=Must use $(IDLIST) in WHERE clause.\\nExample: SELECT ... WHERE idfield IN $(IDLIST) ...
+JDBCConnector.MustReturnIDCOLUMNInTheResult=Must return $(IDCOLUMN) in the result.  Example: SELECT idfield AS $(IDCOLUMN) FROM ...
+JDBCConnector.MustReturnVERSIONCOLUMNInTheResult=Must return $(VERSIONCOLUMN) in the result, containing the document version.  Example: SELECT versionfield AS $(VERSIONCOLUMN), ...
+JDBCConnector.MustUseIDLISTInWHEREClause=Must use $(IDLIST) in WHERE clause.  Example: SELECT ... WHERE idfield IN $(IDLIST) ...
 JDBCConnector.EnterADataQuery=Enter a data query
-JDBCConnector.MustReturnIDCOLUMNInTheResult2=Must return $(IDCOLUMN) in the result.\\nExample: SELECT idfield AS $(IDCOLUMN), ...
-JDBCConnector.MustReturnURLCOLUMNInTheResult=Must return $(URLCOLUMN) in the result, containing the url to use to reach the document.\\nExample: SELECT urlfield AS $(URLCOLUMN), ...
-JDBCConnector.MustReturnDATACOLUMNInTheResult=Must return $(DATACOLUMN) in the result, containing the document data.\\nExample: SELECT datafield AS $(DATACOLUMN), ...
-JDBCConnector.MustReturnTOKENCOLUMNInTheResult=Must return $(TOKENCOLUMN) in the result, containing the access token.\\nExample: SELECT actoken AS $(TOKENCOLUMN), ...
+JDBCConnector.MustReturnIDCOLUMNInTheResult2=Must return $(IDCOLUMN) in the result.  Example: SELECT idfield AS $(IDCOLUMN), ...
+JDBCConnector.MustReturnURLCOLUMNInTheResult=Must return $(URLCOLUMN) in the result, containing the url to use to reach the document.  Example: SELECT urlfield AS $(URLCOLUMN), ...
+JDBCConnector.MustReturnDATACOLUMNInTheResult=Must return $(DATACOLUMN) in the result, containing the document data.  Example: SELECT datafield AS $(DATACOLUMN), ...
+JDBCConnector.MustReturnTOKENCOLUMNInTheResult=Must return $(TOKENCOLUMN) in the result, containing the access token.  Example: SELECT actoken AS $(TOKENCOLUMN), ...
 JDBCConnector.DeleteToken=Delete token #
 JDBCConnector.AddAccessToken=Add access token
 JDBCConnector.SeedingQuery=Seeding query:

Modified: manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_es_ES.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_es_ES.properties?rev=1742941&r1=1742940&r2=1742941&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_es_ES.properties (original)
+++ manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_es_ES.properties Mon May  9 12:50:48 2016
@@ -42,14 +42,14 @@ JDBCConnector.PleaseFillInADatabaseServe
 JDBCConnector.PleaseFillInTheNameOfTheDatabase=Por favor escriba el nombre de la base de datos
 JDBCConnector.PleaseSupplyTheDatabaseUsernameForThisConnection=Por favor, facilite el nombre de usuario de base de datos para esta conexión
 JDBCConnector.EnterASeedingQuery=Escriba una consulta de siembra
-JDBCConnector.MustReturnIDCOLUMNInTheResult=Debe volver $(ID COLUMNA) en el resultado.\\nEjemplo: SELECCIONAR campo ID AS $(ID DE COLUMNA) DE ...
-JDBCConnector.MustReturnVERSIONCOLUMNInTheResult=Debe volver $(COLUMNA DE VERSIÓN) en el resultado, que contiene la versión del documento.\\nEjemplo: SELECCIONAR campo de versión AS $(COLUMNA DE VERSIÓN), ...
-JDBCConnector.MustUseIDLISTInWHEREClause=Debe usar $(LISTA ID) en DONDE cláusula.\\nEjemplo: SELECCIONAR ... DÓNDE campo id IN $(LISTA ID) ...
+JDBCConnector.MustReturnIDCOLUMNInTheResult=Debe volver $(ID COLUMNA) en el resultado.  Ejemplo: SELECCIONAR campo ID AS $(ID DE COLUMNA) DE ...
+JDBCConnector.MustReturnVERSIONCOLUMNInTheResult=Debe volver $(COLUMNA DE VERSIÓN) en el resultado, que contiene la versión del documento.  Ejemplo: SELECCIONAR campo de versión AS $(COLUMNA DE VERSIÓN), ...
+JDBCConnector.MustUseIDLISTInWHEREClause=Debe usar $(LISTA ID) en DONDE cláusula.  Ejemplo: SELECCIONAR ... DÓNDE campo id IN $(LISTA ID) ...
 JDBCConnector.EnterADataQuery=Escriba una consulta de datos
-JDBCConnector.MustReturnIDCOLUMNInTheResult2=Debe volver $(ID COLUMNA) en el resultado.\\nEjemplo: SELECCIONAR campo id AS $(ID DE COLUMNA), ...
-JDBCConnector.MustReturnURLCOLUMNInTheResult=Debe volver $(URL COLUMNA) en el resultado, que contiene la URL a utilizar para alcanzar el documento.\\nEjemplo: SELECCIONAR campo url AS $(URL COLUMNA), ...
-JDBCConnector.MustReturnDATACOLUMNInTheResult=Debe volver $(DATA COLUMNA) en el resultado, que contiene los datos del documento.\\nEjemplo: SELECCIONAR campo de datos AS $(DATOS DE COLUMNA), ...
-JDBCConnector.MustReturnTOKENCOLUMNInTheResult=Debe volver $(TOKEN COLUMNA) en el resultado, que contiene el token de acceso.\\nEjemplo: SELECCIONAR ac token AS $(TOKEN COLUMNA), ...
+JDBCConnector.MustReturnIDCOLUMNInTheResult2=Debe volver $(ID COLUMNA) en el resultado.  Ejemplo: SELECCIONAR campo id AS $(ID DE COLUMNA), ...
+JDBCConnector.MustReturnURLCOLUMNInTheResult=Debe volver $(URL COLUMNA) en el resultado, que contiene la URL a utilizar para alcanzar el documento.  Ejemplo: SELECCIONAR campo url AS $(URL COLUMNA), ...
+JDBCConnector.MustReturnDATACOLUMNInTheResult=Debe volver $(DATA COLUMNA) en el resultado, que contiene los datos del documento.  Ejemplo: SELECCIONAR campo de datos AS $(DATOS DE COLUMNA), ...
+JDBCConnector.MustReturnTOKENCOLUMNInTheResult=Debe volver $(TOKEN COLUMNA) en el resultado, que contiene el token de acceso.  Ejemplo: SELECCIONAR ac token AS $(TOKEN COLUMNA), ...
 JDBCConnector.DeleteToken=eliminar token #
 JDBCConnector.AddAccessToken=Añadir token de acceso
 JDBCConnector.SeedingQuery=consulta Siembra:

Modified: manifoldcf/branches/CONNECTORS-1313/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-1313/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_ja_JP.properties?rev=1742941&r1=1742940&r2=1742941&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_ja_JP.properties (original)
+++ manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_ja_JP.properties Mon May  9 12:50:48 2016
@@ -42,14 +42,14 @@ JDBCConnector.PleaseFillInADatabaseServe
 JDBCConnector.PleaseFillInTheNameOfTheDatabase=データベース名を入力しうてください
 JDBCConnector.PleaseSupplyTheDatabaseUsernameForThisConnection=コネクション用のデータベースユーザ名を入力してください
 JDBCConnector.EnterASeedingQuery=シードクエリーを入力してください
-JDBCConnector.MustReturnIDCOLUMNInTheResult=結果に$(IDCOLUMN)を返す必要があります。\\n例：SELECT idfield AS $(IDCOLUMN) FROM ...
-JDBCConnector.MustReturnVERSIONCOLUMNInTheResult=結果にコンテンツのバージョン情報を含む$(VERSIONCOLUMN)を返す必要があります。\\n例：SELECT versionfield AS $(VERSIONCOLUMN), ...
-JDBCConnector.MustUseIDLISTInWHEREClause=WHERE句に$(IDLIST)を使ってください。\\n例：SELECT ... WHERE idfield IN $(IDLIST) ...
+JDBCConnector.MustReturnIDCOLUMNInTheResult=結果に$(IDCOLUMN)を返す必要があります。 例：SELECT idfield AS $(IDCOLUMN) FROM ...
+JDBCConnector.MustReturnVERSIONCOLUMNInTheResult=結果にコンテンツのバージョン情報を含む$(VERSIONCOLUMN)を返す必要があります。 例：SELECT versionfield AS $(VERSIONCOLUMN), ...
+JDBCConnector.MustUseIDLISTInWHEREClause=WHERE句に$(IDLIST)を使ってください。 例：SELECT ... WHERE idfield IN $(IDLIST) ...
 JDBCConnector.EnterADataQuery=データクエリーを入力してください
-JDBCConnector.MustReturnIDCOLUMNInTheResult2=結果に$(IDCOLUMN)を返す必要があります。\\n例：SELECT idfield AS $(IDCOLUMN), ...
-JDBCConnector.MustReturnURLCOLUMNInTheResult=結果にコンテンツを取得するURIを含む$(URLCOLUMN)を返す必要があります。\\n例：SELECT urlfield AS $(URLCOLUMN), ...
-JDBCConnector.MustReturnDATACOLUMNInTheResult=結果にコンテンツ内容を含む$(DATACOLUMN)を返す必要があります。\\n例：SELECT datafield AS $(DATACOLUMN), ...
-JDBCConnector.MustReturnTOKENCOLUMNInTheResult=Must return $(TOKENCOLUMN) in the result, containing the access token.\\nExample: SELECT actoken AS $(TOKENCOLUMN), ...
+JDBCConnector.MustReturnIDCOLUMNInTheResult2=結果に$(IDCOLUMN)を返す必要があります。 例：SELECT idfield AS $(IDCOLUMN), ...
+JDBCConnector.MustReturnURLCOLUMNInTheResult=結果にコンテンツを取得するURIを含む$(URLCOLUMN)を返す必要があります。 例：SELECT urlfield AS $(URLCOLUMN), ...
+JDBCConnector.MustReturnDATACOLUMNInTheResult=結果にコンテンツ内容を含む$(DATACOLUMN)を返す必要があります。 例：SELECT datafield AS $(DATACOLUMN), ...
+JDBCConnector.MustReturnTOKENCOLUMNInTheResult=Must return $(TOKENCOLUMN) in the result, containing the access token.  Example: SELECT actoken AS $(TOKENCOLUMN), ...
 JDBCConnector.DeleteToken=トークンを削除： #
 JDBCConnector.AddAccessToken=アクセストークンを追加
 JDBCConnector.SeedingQuery=シードクエリー：

Modified: manifoldcf/branches/CONNECTORS-1313/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-1313/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_zh_CN.properties?rev=1742941&r1=1742940&r2=1742941&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_zh_CN.properties (original)
+++ manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_zh_CN.properties Mon May  9 12:50:48 2016
@@ -42,14 +42,14 @@ JDBCConnector.PleaseFillInADatabaseServe
 JDBCConnector.PleaseFillInTheNameOfTheDatabase=请输入数据库名
 JDBCConnector.PleaseSupplyTheDatabaseUsernameForThisConnection=请输入此连接的数据库用户名
 JDBCConnector.EnterASeedingQuery=请输入播种查询
-JDBCConnector.MustReturnIDCOLUMNInTheResult=结果需要返回$(IDCOLUMN)。\\n例: SELECT idfield AS $(IDCOLUMN) FROM ...
-JDBCConnector.MustReturnVERSIONCOLUMNInTheResult=返回结果必须包含文档版本信息$(VERSIONCOLUMN)\\n例: SELECT versionfield AS $(VERSIONCOLUMN), ...
-JDBCConnector.MustUseIDLISTInWHEREClause=WHERE语句务必使用$(IDLIST)。\\n例: SELECT ... WHERE idfield IN $(IDLIST) ...
+JDBCConnector.MustReturnIDCOLUMNInTheResult=结果需要返回$(IDCOLUMN)。 例: SELECT idfield AS $(IDCOLUMN) FROM ...
+JDBCConnector.MustReturnVERSIONCOLUMNInTheResult=返回结果必须包含文档版本信息$(VERSIONCOLUMN)。 例: SELECT versionfield AS $(VERSIONCOLUMN), ...
+JDBCConnector.MustUseIDLISTInWHEREClause=WHERE语句务必使用$(IDLIST)。 例: SELECT ... WHERE idfield IN $(IDLIST) ...
 JDBCConnector.EnterADataQuery=请输入数据查询
-JDBCConnector.MustReturnIDCOLUMNInTheResult2=结果需要返回$(IDCOLUMN)。\\n例: SELECT idfield AS $(IDCOLUMN), ...
-JDBCConnector.MustReturnURLCOLUMNInTheResult=返回结果必须包含取得文档用URI$(URLCOLUMN)。\\n例: SELECT urlfield AS $(URLCOLUMN), ...
-JDBCConnector.MustReturnDATACOLUMNInTheResult=返回结果必须包含文档内容$(DATACOLUMN)。\\n例: SELECT datafield AS $(DATACOLUMN), ...
-JDBCConnector.MustReturnTOKENCOLUMNInTheResult=Must return $(TOKENCOLUMN) in the result, containing the access token.\\nExample: SELECT actoken AS $(TOKENCOLUMN), ...
+JDBCConnector.MustReturnIDCOLUMNInTheResult2=结果需要返回$(IDCOLUMN)。 例: SELECT idfield AS $(IDCOLUMN), ...
+JDBCConnector.MustReturnURLCOLUMNInTheResult=返回结果必须包含取得文档用URI$(URLCOLUMN)。 例: SELECT urlfield AS $(URLCOLUMN), ...
+JDBCConnector.MustReturnDATACOLUMNInTheResult=返回结果必须包含文档内容$(DATACOLUMN)。 例: SELECT datafield AS $(DATACOLUMN), ...
+JDBCConnector.MustReturnTOKENCOLUMNInTheResult=Must return $(TOKENCOLUMN) in the result, containing the access token.  Example: SELECT actoken AS $(TOKENCOLUMN), ...
 JDBCConnector.DeleteToken=删除令牌:  #
 JDBCConnector.AddAccessToken=添加访问令牌
 JDBCConnector.SeedingQuery=播种查询: