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

[kwright]

Author: kwright
Date: Tue May 10 11:29:12 2016
New Revision: 1743156

URL: http://svn.apache.org/viewvc?rev=1743156&view=rev
Log:
Fix another couple of minor issues.

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/authorities/authorities/jdbc/common_es_ES.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=1743156&r1=1743155&r2=1743156&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
 Tue May 10 11:29:12 2016
@@ -592,7 +592,7 @@ public class JDBCConnector extends org.a
             {
               Object o = row.getValue(JDBCConstants.idReturnColumnName);
               if (o == null)
-                throw new ManifoldCFException("Bad acl query; doesn't return 
$(IDCOLUMN) column.  Try using quotes around $(IDCOLUMN) variable, e.g. 
\"$(IDCOLUMN)\", or, for MySQL, select \"by label\" in your repository 
connection.");
+                throw new ManifoldCFException("Bad attribute query; doesn't 
return $(IDCOLUMN) column.  Try using quotes around $(IDCOLUMN) variable, e.g. 
\"$(IDCOLUMN)\", or, for MySQL, select \"by label\" in your repository 
connection.");
               String idValue = JDBCConnection.readAsString(o);
               o = row.getValue(JDBCConstants.dataReturnColumnName);
               String dataValue;
@@ -600,7 +600,6 @@ public class JDBCConnector extends org.a
                 dataValue = "";
               else
                 dataValue = JDBCConnection.readAsString(o);
-              // Versions that are "", when processed, will have their acls 
fetched at that time...
               Map<String, Set<String>> avs = attributeValues.get(idValue);
               if (avs == null)
               {

Modified: 
manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/jdbc/common_es_ES.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/jdbc/common_es_ES.properties?rev=1743156&r1=1743155&r2=1743156&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/jdbc/common_es_ES.properties
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1313/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/jdbc/common_es_ES.properties
 Tue May 10 11:29:12 2016
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 JDBCAuthority.DatabaseType=Tipo de base de datos
-JDBCAuthority.AccessMethod=Método de acceso
+JDBCAuthority.AccessMethod=Método de acceso
 JDBCAuthority.ByName=por nombre
 JDBCAuthority.ByLabel=por etiqueta
 JDBCAuthority.Server=Server
@@ -22,17 +22,17 @@ JDBCAuthority.Credentials=Credenciales
 JDBCAuthority.DatabaseType2=tipo de base de datos
 JDBCAuthority.DatabaseHostAndPort=Base de datos de host y el puerto
 JDBCAuthority.DatabaseServiceNameOrInstanceDatabase=Base de datos el nombre 
del servicio o instancia base de datos
-JDBCAuthority.RawDatabaseConnectString=Base de datos RAW cadena de conexión:
+JDBCAuthority.RawDatabaseConnectString=Base de datos RAW cadena de conexión:
 JDBCAuthority.UserName=Nombre de usuario:
 JDBCAuthority.Password=Password:
-JDBCAuthority.Parameters=Parámetros:
+JDBCAuthority.Parameters=Parámetros:
 JDBCAuthority.Queries=consultas
 JDBCAuthority.UserIdQuery=Usuario consulta ID:
-JDBCAuthority.TokenQuery=Autorización fichas de consulta:
-JDBCAuthority.returnUserIdOrEmptyResultset=(volver Identificación del usuario 
si existe usuario o conjunto de resultados vacío)
-JDBCAuthority.returnTokensForUser=(autorización de devolución fichas de 
usuario)
+JDBCAuthority.TokenQuery=Autorización fichas de consulta:
+JDBCAuthority.returnUserIdOrEmptyResultset=(volver Identificación del usuario 
si existe usuario o conjunto de resultados vacío)
+JDBCAuthority.returnTokensForUser=(autorización de devolución fichas de 
usuario)
 JDBCAuthority.NoAccessTokensPresent=No hay tokens de acceso actuales
 JDBCAuthority.NoAccessTokensSpecified=No hay tokens de acceso especificados
 JDBCAuthority.PleaseFillInADatabaseServerName=Por favor, rellene un nombre de 
servidor de base de datos
 JDBCAuthority.PleaseFillInTheNameOfTheDatabase=Por favor escriba el nombre de 
la base de datos
-JDBCAuthority.PleaseSupplyTheDatabaseUsernameForThisConnection=Por favor, 
facilite el nombre de usuario de base de datos para esta conexión
\ No newline at end of file
+JDBCAuthority.PleaseSupplyTheDatabaseUsernameForThisConnection=Por favor, 
facilite el nombre de usuario de base de datos para esta conexión
\ No newline at end of file