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

[kwright]

Author: kwright
Date: Mon May  9 11:31:19 2016
New Revision: 1742927

URL: http://svn.apache.org/viewvc?rev=1742927&view=rev
Log:
Add specification body code

Removed:
    
manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/resource/
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/java/org/apache/manifoldcf/jdbc/JDBCConstants.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=1742927&r1=1742926&r2=1742927&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 11:31:19 2016
@@ -1303,6 +1303,7 @@ public class JDBCConnector extends org.a
     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 
$(TOKENCOLUMN) FROM acltable WHERE docidfield IN $(IDLIST)";
     
+    final Map<String, String> attributeQueryMap = new HashMap<String, 
String>();
     int i = 0;
     while (i < ds.getChildCount())
     {
@@ -1331,8 +1332,18 @@ public class JDBCConnector extends org.a
         if (aclQuery == null)
           aclQuery = "";
       }
+      else if (sn.getType().equals(JDBCConstants.attributeQueryNode))
+      {
+        String attributeName = 
sn.getAttributeValue(JDBCConstants.attributeName);
+        String attributeQuery = sn.getValue();
+        attributeQueryMap.put(attributeName, attributeQuery);
+      }
     }
 
+    // Sort the attribute query list
+    final String[] attributeNames = attributeQueryMap.keySet().toArray(new 
String[0]);
+    java.util.Arrays.sort(attributeNames);
+    
     // The Queries tab
 
     if (tabName.equals(Messages.getString(locale,"JDBCConnector.Queries")) && 
connectionSequenceNumber == actualSequenceNumber)
@@ -1355,6 +1366,91 @@ public class JDBCConnector extends org.a
 "  <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");
+      out.print(
+"  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
+"  <tr>"+
+"    <td class=\"description\"><nobr>" + 
Messages.getBodyString(locale,"JDBCConnector.AttributeQueries") + 
"</nobr></td>\n"+
+"    <td class=\"boxcell\">\n"+
+"      <table class=\"formtable\">\n"+
+"        <tr class=\"formheaderrow\">\n"+
+"          <td class=\"formcolumnheader\"></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>" + 
Messages.getBodyString(locale,"JDBCConnector.AttributeName") + "</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>" + 
Messages.getBodyString(locale,"JDBCConnector.AttributeQuery") + 
"</nobr></td>\n"+
+"        </tr>\n"
+      );
+      int attributeIndex = 0;
+      for (final String attributeName : attributeNames) {
+        final String attributeQuery = attributeQueryMap.get(attributeName);
+        if (attributeIndex % 2 == 0)
+        {
+          out.print(
+"        <tr class=\"evenformrow\">\n"
+          );
+        }
+        else 
+        {
+          out.print(
+"        <tr class=\"oddformrow\">\n"
+          );
+        }
+        // Delete button
+        out.print(
+"          <td class=\"formcolumncell\">\n"+
+"            <a name=\""+seqPrefix+"attr_"+attributeIndex+"\">\n"+
+"              <nobr>\n"+
+"                <input type=\"button\" 
value=\""+Messages.getAttributeString(locale,"JDBCConnector.Delete")+"\"\n"+
+"                
alt=\""+Messages.getAttributeString(locale,"JDBCConnector.DeleteAttributeQueryNumber")+attributeIndex+"\"
 onclick=\"javascript:"+seqPrefix+"deleteAttr("+attributeIndex+");\"/>\n"+
+"              </nobr>\n"+
+"            </a>\n"+
+"            <input type=\"hidden\" 
name=\""+seqPrefix+"attr_"+attributeIndex+"_op"+"\" value=\"Continue\"/>\n"+
+"            <input type=\"hidden\" 
name=\""+seqPrefix+"attr_"+attributeIndex+"_name\" 
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(attributeName)+"\"/>\n"+
+"          </td>\n"
+        );
+        // Attribute name
+        out.print(
+"          <td class=\"formcolumncell\">\n"+
+"            
"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(attributeName)+"\n"+
+"          </td>\n"
+        );
+        // 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"+
+"          </td>\n"
+        );
+        out.print(
+"        </tr>\n"
+        );
+        attributeIndex++;
+      }
+      if (attributeIndex == 0)
+      {
+        out.print(
+"        <tr><td class=\"formmessage\" 
colspan=\"3\">"+Messages.getBodyString(locale,"JDBCConnector.NoAttributeQueries")+"</td></tr>\n"
+        );
+      }
+      // Add button
+      out.print(
+"        <tr><td class=\"formseparator\" colspan=\"3\"><hr/></td></tr>\n"+
+"        <tr class=\"formrow\">\n"+
+"          <td class=\"formcolumncell\">\n"+
+"            <a name=\""+seqPrefix+"attr\">\n"+
+"              <input type=\"button\" 
value=\""+Messages.getAttributeString(locale,"JDBCConnector.Add")+"\"\n"+
+"              
alt=\""+Messages.getAttributeString(locale,"JDBCConnector.AddAttribute")+"\" 
onclick=\"javascript:"+seqPrefix+"addAttr();\"/>\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\">\n"+
+"            <textarea name=\""+seqPrefix+"attr_query\" cols=\"64\" 
rows=\"6\"></textarea>\n"+
+"          </td>\n"+
+"        </tr>\n"
+      );
+      out.print(
+"      </table>\n"+
+"    </td>\n"+
 "  </tr>\n"+
 "</table>\n"
       );
@@ -1367,6 +1463,18 @@ public class JDBCConnector extends org.a
 "<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"
       );
+      int attributeIndex = 0;
+      for (final String attributeName : attributeNames) {
+        final String attributeQuery = attributeQueryMap.get(attributeName);
+        out.print(
+"<input type=\"hidden\" name=\""+seqPrefix+"attr_"+attributeIndex+"_name\" 
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(attributeName)+"\"/>\n"+
+"<input type=\"hidden\" name=\""+seqPrefix+"attr_"+attributeIndex+"_query\" 
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(attributeQuery)+"\"/>\n"
+        );
+        attributeIndex++;
+      }
+      out.print(
+"<input type=\"hidden\" name=\""+seqPrefix+"attr_count\" 
value=\""+attributeIndex+"\"/>\n"
+      );
     }
        
     // Security tab

Modified: 
manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/jdbc/JDBCConstants.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/jdbc/JDBCConstants.java?rev=1742927&r1=1742926&r2=1742927&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/jdbc/JDBCConstants.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/jdbc/JDBCConstants.java
 Mon May  9 11:31:19 2016
@@ -47,6 +47,10 @@ public class JDBCConstants
   public static String dataQueryNode = "dataquery";
   /** The node containing the acl query */
   public static String aclQueryNode = "aclquery";
+  /** The node containing an attribute query */
+  public static String attributeQueryNode = "attrquery";
+  /** The attribute name for an attribute query */
+  public static String attributeName = "attributename";
 
   /** The name of the id return column */
   public static String idReturnColumnName = "lcf__id";

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=1742927&r1=1742926&r2=1742927&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 11:31:19 2016
@@ -62,3 +62,12 @@ JDBCConnector.leaveBlankIfNoSecurityCapa
 JDBCConnector.SecurityColon=Security:
 JDBCConnector.Enabled=Enabled
 JDBCConnector.Disabled=Disabled
+
+JDBCConnector.AttributeQueries=Attribute queries:
+JDBCConnector.AttributeName=Attribute name
+JDBCConnector.AttributeQuery=Attribute query
+JDBCConnector.Delete=Delete
+JDBCConnector.DeleteAttributeQueryNumber=Delete attribute query #
+JDBCConnector.NoAttributeQueries=No attribute queries
+JDBCConnector.Add=Add
+JDBCConnector.AddAttribute=Add attribute
\ No newline at end of file

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=1742927&r1=1742926&r2=1742927&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 11:31:19 2016
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 JDBCConnector.DatabaseType=Tipo de base de datos
-JDBCConnector.AccessMethod=Método de acceso
+JDBCConnector.AccessMethod=Método de acceso
 JDBCConnector.ByName=por nombre
 JDBCConnector.ByLabel=por etiqueta
 JDBCConnector.Server=Servidor
@@ -22,15 +22,15 @@ JDBCConnector.Credentials=Credenciales
 JDBCConnector.DatabaseType2=Tipo de base de datos:
 JDBCConnector.DatabaseHostAndPort=Base de datos de host y el puerto:
 JDBCConnector.DatabaseServiceNameOrInstanceDatabase=Base de datos el nombre 
del servicio o instancia / base de datos:
-JDBCConnector.RawDatabaseConnectString=Base de datos RAW cadena de conexión:
+JDBCConnector.RawDatabaseConnectString=Base de datos RAW cadena de conexión:
 JDBCConnector.UserName=nombre de usuario:
-JDBCConnector.Password=Contraseña:
-JDBCConnector.Parameters=Paràmetros:
+JDBCConnector.Password=Contraseña:
+JDBCConnector.Parameters=Paràmetros:
 JDBCConnector.TypeInAnAccessToken=Escriba un token de acceso
 JDBCConnector.Queries=consultas
 JDBCConnector.Security=Seguridad
 JDBCConnector.SeedingQuery=consulta Siembra:
-JDBCConnector.VersionCheckQuery=Pregunta de comprobación de versión:
+JDBCConnector.VersionCheckQuery=Pregunta de comprobación de versión:
 JDBCConnector.returnIdsAndVersionsForASetOfDocuments=(devolver los 
identificadores y las versiones para un conjunto de documentos;
 JDBCConnector.leaveBlankIfNoVersioningCapability=salir si hay capacidad de 
versiones en blanco)
 JDBCConnector.DataQuery=consulta de datos:
@@ -40,20 +40,20 @@ JDBCConnector.NoAccessTokensPresent=No h
 JDBCConnector.NoAccessTokensSpecified=No hay tokens de acceso especificados
 JDBCConnector.PleaseFillInADatabaseServerName=Por favor, rellene un nombre de 
servidor de base de datos
 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.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.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.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.DeleteToken=eliminar token #
-JDBCConnector.AddAccessToken=Añadir token de acceso
+JDBCConnector.AddAccessToken=Añadir token de acceso
 JDBCConnector.SeedingQuery=consulta Siembra:
-JDBCConnector.VersionCheckQuery=Verificaciòn de la versiòn:
+JDBCConnector.VersionCheckQuery=Verificaciòn de la versiòn:
 JDBCConnector.DataQuery=consulta de datos:
 JDBCConnector.AccessTokens=Tokens de acceso:
 JDBCConnector.AccessTokenQuery=Acceso consulta token:
@@ -62,3 +62,12 @@ JDBCConnector.leaveBlankIfNoSecurityCapa
 JDBCConnector.SecurityColon=Seguridad:
 JDBCConnector.Enabled=Activado
 JDBCConnector.Disabled=Imposibilitado
+
+JDBCConnector.AttributeQueries=Attribute queries:
+JDBCConnector.AttributeName=Attribute name
+JDBCConnector.AttributeQuery=Attribute query
+JDBCConnector.Delete=Delete
+JDBCConnector.DeleteAttributeQueryNumber=Delete attribute query #
+JDBCConnector.NoAttributeQueries=No attribute queries
+JDBCConnector.Add=Add
+JDBCConnector.AddAttribute=Add attribute

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=1742927&r1=1742926&r2=1742927&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 11:31:19 2016
@@ -62,3 +62,12 @@ JDBCConnector.leaveBlankIfNoSecurityCapa
 JDBCConnector.SecurityColon=Security:
 JDBCConnector.Enabled=Enabled
 JDBCConnector.Disabled=Disabled
+
+JDBCConnector.AttributeQueries=Attribute queries:
+JDBCConnector.AttributeName=Attribute name
+JDBCConnector.AttributeQuery=Attribute query
+JDBCConnector.Delete=Delete
+JDBCConnector.DeleteAttributeQueryNumber=Delete attribute query #
+JDBCConnector.NoAttributeQueries=No attribute queries
+JDBCConnector.Add=Add
+JDBCConnector.AddAttribute=Add attribute
\ No newline at end of file

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=1742927&r1=1742926&r2=1742927&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 11:31:19 2016
@@ -62,3 +62,12 @@ JDBCConnector.leaveBlankIfNoSecurityCapa
 JDBCConnector.SecurityColon=Security:
 JDBCConnector.Enabled=Enabled
 JDBCConnector.Disabled=Disabled
+
+JDBCConnector.AttributeQueries=Attribute queries:
+JDBCConnector.AttributeName=Attribute name
+JDBCConnector.AttributeQuery=Attribute query
+JDBCConnector.Delete=Delete
+JDBCConnector.DeleteAttributeQueryNumber=Delete attribute query #
+JDBCConnector.NoAttributeQueries=No attribute queries
+JDBCConnector.Add=Add
+JDBCConnector.AddAttribute=Add attribute
\ No newline at end of file