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/06/20 02:57:13 UTC
svn commit: r1604061 - in /manifoldcf/branches/CONNECTORS-954:
connectors/amazoncloudsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/amazoncloudsearch/
connectors/amazoncloudsearch/connector/src/main/resources/org/apache/manifoldcf/a...
Author: kwright
Date: Fri Jun 20 00:57:13 2014
New Revision: 1604061
URL: http://svn.apache.org/r1604061
Log:
Get it to compile
Removed:
manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/amazoncloudsearch/editSpecification_FieldMapping.html
Modified:
manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/amazoncloudsearch/AmazonCloudSearchConnector.java
manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/amazoncloudsearch/DocumentChunkManager.java
manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/amazoncloudsearch/DocumentRecord.java
manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/amazoncloudsearch/editSpecification.js
manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/amazoncloudsearch/viewSpecification.html
manifoldcf/branches/CONNECTORS-954/framework/core/src/main/java/org/apache/manifoldcf/core/jsongen/JSONArrayReader.java
manifoldcf/branches/CONNECTORS-954/framework/core/src/main/java/org/apache/manifoldcf/core/jsongen/JSONNameValueReader.java
manifoldcf/branches/CONNECTORS-954/framework/core/src/main/java/org/apache/manifoldcf/core/jsongen/JSONValueReader.java
Modified: manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/amazoncloudsearch/AmazonCloudSearchConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/amazoncloudsearch/AmazonCloudSearchConnector.java?rev=1604061&r1=1604060&r2=1604061&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/amazoncloudsearch/AmazonCloudSearchConnector.java (original)
+++ manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/amazoncloudsearch/AmazonCloudSearchConnector.java Fri Jun 20 00:57:13 2014
@@ -20,9 +20,11 @@ package org.apache.manifoldcf.agents.out
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.InterruptedIOException;
import java.io.StringReader;
import java.io.BufferedReader;
+import java.io.Reader;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -31,6 +33,7 @@ import java.util.Map;
import java.util.Locale;
import java.util.Set;
import java.util.HashSet;
+import java.util.Date;
import org.apache.commons.io.input.ReaderInputStream;
@@ -43,6 +46,7 @@ import org.apache.http.client.ClientProt
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
+import org.apache.http.entity.InputStreamEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
@@ -98,7 +102,6 @@ public class AmazonCloudSearchConnector
private static final String EDIT_SPECIFICATION_JS = "editSpecification.js";
private static final String EDIT_SPECIFICATION_CONTENTS_HTML = "editSpecification_Contents.html";
- private static final String EDIT_SPECIFICATION_FIELDMAPPING_HTML = "editSpecification_FieldMapping.html";
private static final String VIEW_SPECIFICATION_HTML = "viewSpecification.html";
@@ -152,7 +155,7 @@ public class AmazonCloudSearchConnector
ManifoldCF.getMasterDatabaseUsername(),
ManifoldCF.getMasterDatabasePassword());
- DocumentChunkManager dcmanager = new DocumentChunkManager(threadContext,mainDatabase);
+ DocumentChunkManager dcmanager = new DocumentChunkManager(mainDatabase);
dcmanager.deinstall();
}
@@ -208,7 +211,7 @@ public class AmazonCloudSearchConnector
ManifoldCF.getMasterDatabaseName(),
ManifoldCF.getMasterDatabaseUsername(),
ManifoldCF.getMasterDatabasePassword());
- documentChunkManager = new DocumentChunkManager(currentContext,databaseHandle);
+ documentChunkManager = new DocumentChunkManager(databaseHandle);
}
serverHost = params.getParameter(AmazonCloudSearchConfig.SERVER_HOST);
@@ -251,7 +254,7 @@ public class AmazonCloudSearchConnector
public String check() throws ManifoldCFException {
try {
getSession();
- String responsbody = postData(new InputStreamReader(new StringReader("[]"),Consts.UTF_8));
+ String responsbody = postData(new ReaderInputStream(new StringReader("[]"),Consts.UTF_8));
String status = "";
try
{
@@ -392,8 +395,8 @@ public class AmazonCloudSearchConnector
*@return the document status (accepted or permanently rejected).
*/
@Override
- public int addOrReplaceDocument(String documentURI, String outputDescription, RepositoryDocument document, String authorityNameString, IOutputAddActivity activities)
- throws ManifoldCFException, ServiceInterruption
+ public int addOrReplaceDocumentWithException(String documentURI, String outputDescription, RepositoryDocument document, String authorityNameString, IOutputAddActivity activities)
+ throws ManifoldCFException, ServiceInterruption, IOException
{
// Establish a session
getSession();
@@ -407,9 +410,9 @@ public class AmazonCloudSearchConnector
// Build the metadata field part
JSONObjectReader fieldReader = new JSONObjectReader();
// Add the type and ID
- objectReader.addNameValuePair(new JSONNameValueReader(new JSONStringValue("id"),new JSONStringValue(uid)))
- .addNameValuePair(new JSONNameValueReader(new JSONStringValue("type"),new JSONStringValue("add")))
- .addNameValuePair(new JSONNameValueReader(new JSONStringValue("fields"),fieldReader));
+ objectReader.addNameValuePair(new JSONNameValueReader(new JSONStringReader("id"),new JSONStringReader(uid)))
+ .addNameValuePair(new JSONNameValueReader(new JSONStringReader("type"),new JSONStringReader("add")))
+ .addNameValuePair(new JSONNameValueReader(new JSONStringReader("fields"),fieldReader));
// Populate the fields...
Iterator<String> itr = document.getFields();
@@ -440,7 +443,7 @@ public class AmazonCloudSearchConnector
}
}
else
- throw IllegalStateException("Unexpected metadata type: "+fieldValues.getClass().getName());
+ throw new IllegalStateException("Unexpected metadata type: "+fieldValues.getClass().getName());
fieldReader.addNameValuePair(new JSONNameValueReader(new JSONStringReader(fieldName),new JSONArrayReader(elements)));
}
@@ -449,7 +452,7 @@ public class AmazonCloudSearchConnector
fieldReader.addNameValuePair(new JSONNameValueReader(new JSONStringReader(FILE_BODY_TEXT_FIELDNAME),
new JSONStringReader(new InputStreamReader(document.getBinaryStream(),Consts.UTF_8))));
- documentChunkManager.addOrReplaceDocument(uid, serverHost, serverPath, new ReaderInputStream(objectReader, Consts.UTF_8));
+ documentChunkManager.recordDocument(uid, serverHost, serverPath, new ReaderInputStream(objectReader, Consts.UTF_8));
return DOCUMENTSTATUS_ACCEPTED;
}
@@ -473,10 +476,17 @@ public class AmazonCloudSearchConnector
// Build a JSON generator
JSONObjectReader objectReader = new JSONObjectReader();
// Add the type and ID
- objectReader.addNameValuePair(new JSONNameValueReader(new JSONStringValue("id"),new JSONStringValue(uid)))
- .addNameValuePair(new JSONNameValueReader(new JSONStringValue("type"),new JSONStringValue("delete")))
+ objectReader.addNameValuePair(new JSONNameValueReader(new JSONStringReader("id"),new JSONStringReader(uid)))
+ .addNameValuePair(new JSONNameValueReader(new JSONStringReader("type"),new JSONStringReader("delete")));
- documentChunkManager.removeDocument(uid, serverHost, serverPath, new ReaderInputStream(objectReader, Consts.UTF_8));
+ try
+ {
+ documentChunkManager.recordDocument(uid, serverHost, serverPath, new ReaderInputStream(objectReader, Consts.UTF_8));
+ }
+ catch (IOException e)
+ {
+ handleIOException(e);
+ }
}
@Override
@@ -494,15 +504,15 @@ public class AmazonCloudSearchConnector
if (records.length == 0)
break;
// The records consist of up to 1000 individual input streams, which must be all concatenated together into the post
- // To do that, we've got a composite input stream object we glue all these together with.
- CompositeInputStream cis = new CompositeInputStream();
+ // To do that, we go into and out of Reader space once again...
+ JSONArrayReader arrayReader = new JSONArrayReader();
for (DocumentRecord dr : records)
{
- cis.addStream(dr.getDataStream());
+ arrayReader.addArrayElement(new JSONValueReader(new InputStreamReader(dr.getDataStream(),Consts.UTF_8)));
}
//post data..
- String responsbody = postData(cis);
+ String responsbody = postData(new ReaderInputStream(arrayReader,Consts.UTF_8));
// check status
String status = getStatusFromJsonResponse(responsbody);
if("success".equals(status))
@@ -513,7 +523,7 @@ public class AmazonCloudSearchConnector
}
else
{
- Logging.connectors.error("AmazonCloudSearch: Error sending document chunk "+ chunkNumber+": "+ responseBody);
+ Logging.connectors.error("AmazonCloudSearch: Error sending document chunk "+ chunkNumber+": "+ responsbody);
throw new ManifoldCFException("recieved error status from service after feeding document. response body : " + responsbody);
}
}
@@ -540,27 +550,12 @@ public class AmazonCloudSearchConnector
else if (exception instanceof RuntimeException)
throw (RuntimeException)exception;
else
- throw new RuntimeException("Unknown exception class thrown: "+exception.getClass().getName()+": "+exception.getMessage(),e);
+ throw new RuntimeException("Unknown exception class thrown: "+exception.getClass().getName()+": "+exception.getMessage(),exception);
}
}
}
}
- protected static class CompositeInputStream extends InputStream
- {
-
- public CompositeInputStream()
- {
- }
-
- public void addStream(InputStream stream)
- {
- // MHL
- }
-
- // MHL
- }
-
/**
* Fill in a Server tab configuration parameter map for calling a Velocity
* template.
@@ -742,40 +737,6 @@ public class AmazonCloudSearchConnector
currentTime + 300000L, currentTime + 3 * 60 * 60000L, -1, false);
}
- protected static void fillInFieldMappingSpecificationMap(Map<String,Object> paramMap, Specification os)
- {
- // Prep for field mappings
- List<Map<String,String>> fieldMappings = new ArrayList<Map<String,String>>();
- String keepAllMetadataValue = "true";
- for (int i = 0; i < os.getChildCount(); i++)
- {
- SpecificationNode sn = os.getChild(i);
- if (sn.getType().equals(AmazonCloudSearchConfig.NODE_FIELDMAP)) {
- String source = sn.getAttributeValue(AmazonCloudSearchConfig.ATTRIBUTE_SOURCE);
- String target = sn.getAttributeValue(AmazonCloudSearchConfig.ATTRIBUTE_TARGET);
- String targetDisplay;
- if (target == null)
- {
- target = "";
- targetDisplay = "(remove)";
- }
- else
- targetDisplay = target;
- Map<String,String> fieldMapping = new HashMap<String,String>();
- fieldMapping.put("SOURCE",source);
- fieldMapping.put("TARGET",target);
- fieldMapping.put("TARGETDISPLAY",targetDisplay);
- fieldMappings.add(fieldMapping);
- }
- else if (sn.getType().equals(AmazonCloudSearchConfig.NODE_KEEPMETADATA))
- {
- keepAllMetadataValue = sn.getAttributeValue(AmazonCloudSearchConfig.ATTRIBUTE_VALUE);
- }
- }
- paramMap.put("FIELDMAPPINGS",fieldMappings);
- paramMap.put("KEEPALLMETADATA",keepAllMetadataValue);
- }
-
protected static void fillInContentsSpecificationMap(Map<String,Object> paramMap, Specification os)
{
String maxFileSize = AmazonCloudSearchConfig.MAXLENGTH_DEFAULT;
@@ -833,11 +794,9 @@ public class AmazonCloudSearchConnector
Map<String, Object> paramMap = new HashMap<String, Object>();
paramMap.put("SEQNUM",Integer.toString(connectionSequenceNumber));
- tabsArray.add(Messages.getString(locale, "AmazonCloudSearchOutputConnector.FieldMappingTabName"));
tabsArray.add(Messages.getString(locale, "AmazonCloudSearchOutputConnector.ContentsTabName"));
// Fill in the specification header map, using data from all tabs.
- fillInFieldMappingSpecificationMap(paramMap, os);
fillInContentsSpecificationMap(paramMap, os);
Messages.outputResourceWithVelocity(out,locale,EDIT_SPECIFICATION_JS,paramMap);
@@ -867,10 +826,8 @@ public class AmazonCloudSearchConnector
paramMap.put("SELECTEDNUM",Integer.toString(actualSequenceNumber));
// Fill in the field mapping tab data
- fillInFieldMappingSpecificationMap(paramMap, os);
fillInContentsSpecificationMap(paramMap, os);
Messages.outputResourceWithVelocity(out,locale,EDIT_SPECIFICATION_CONTENTS_HTML,paramMap);
- Messages.outputResourceWithVelocity(out,locale,EDIT_SPECIFICATION_FIELDMAPPING_HTML,paramMap);
}
/** Process a specification post.
@@ -942,69 +899,6 @@ public class AmazonCloudSearchConnector
os.addChild(os.getChildCount(),sn);
}
- x = variableContext.getParameter(seqPrefix+"cloudsearch_fieldmapping_count");
- if (x != null && x.length() > 0)
- {
- // About to gather the fieldmapping nodes, so get rid of the old ones.
- int i = 0;
- while (i < os.getChildCount())
- {
- SpecificationNode node = os.getChild(i);
- if (node.getType().equals(AmazonCloudSearchConfig.NODE_FIELDMAP) || node.getType().equals(AmazonCloudSearchConfig.NODE_KEEPMETADATA))
- os.removeChild(i);
- else
- i++;
- }
- int count = Integer.parseInt(x);
- i = 0;
- while (i < count)
- {
- String prefix = seqPrefix+"cloudsearch_fieldmapping_";
- String suffix = "_"+Integer.toString(i);
- String op = variableContext.getParameter(prefix+"op"+suffix);
- if (op == null || !op.equals("Delete"))
- {
- // Gather the fieldmap etc.
- String source = variableContext.getParameter(prefix+"source"+suffix);
- String target = variableContext.getParameter(prefix+"target"+suffix);
- if (target == null)
- target = "";
- SpecificationNode node = new SpecificationNode(AmazonCloudSearchConfig.NODE_FIELDMAP);
- node.setAttribute(AmazonCloudSearchConfig.ATTRIBUTE_SOURCE,source);
- node.setAttribute(AmazonCloudSearchConfig.ATTRIBUTE_TARGET,target);
- os.addChild(os.getChildCount(),node);
- }
- i++;
- }
-
- String addop = variableContext.getParameter(seqPrefix+"cloudsearch_fieldmapping_op");
- if (addop != null && addop.equals("Add"))
- {
- String source = variableContext.getParameter(seqPrefix+"cloudsearch_fieldmapping_source");
- String target = variableContext.getParameter(seqPrefix+"cloudsearch_fieldmapping_target");
- if (target == null)
- target = "";
- SpecificationNode node = new SpecificationNode(AmazonCloudSearchConfig.NODE_FIELDMAP);
- node.setAttribute(AmazonCloudSearchConfig.ATTRIBUTE_SOURCE,source);
- node.setAttribute(AmazonCloudSearchConfig.ATTRIBUTE_TARGET,target);
- os.addChild(os.getChildCount(),node);
- }
-
- // Gather the keep all metadata parameter to be the last one
- SpecificationNode node = new SpecificationNode(AmazonCloudSearchConfig.NODE_KEEPMETADATA);
- String keepAll = variableContext.getParameter(seqPrefix+"cloudsearch_keepallmetadata");
- if (keepAll != null)
- {
- node.setAttribute(AmazonCloudSearchConfig.ATTRIBUTE_VALUE, keepAll);
- }
- else
- {
- node.setAttribute(AmazonCloudSearchConfig.ATTRIBUTE_VALUE, "false");
- }
- // Add the new keepallmetadata config parameter
- os.addChild(os.getChildCount(), node);
- }
-
return null;
}
@@ -1026,7 +920,6 @@ public class AmazonCloudSearchConnector
paramMap.put("SEQNUM",Integer.toString(connectionSequenceNumber));
// Fill in the map with data from all tabs
- fillInFieldMappingSpecificationMap(paramMap, os);
fillInContentsSpecificationMap(paramMap, os);
Messages.outputResourceWithVelocity(out,locale,VIEW_SPECIFICATION_HTML,paramMap);
@@ -1055,32 +948,18 @@ public class AmazonCloudSearchConnector
protected static class SpecPacker {
- private final Map<String,String> sourceTargets = new HashMap<String,String>();
- private final boolean keepAllMetadata;
private final Set<String> extensions = new HashSet<String>();
private final Set<String> mimeTypes = new HashSet<String>();
private final Long lengthCutoff;
public SpecPacker(Specification os) {
- boolean keepAllMetadata = true;
Long lengthCutoff = null;
String extensions = null;
String mimeTypes = null;
for (int i = 0; i < os.getChildCount(); i++) {
SpecificationNode sn = os.getChild(i);
- if(sn.getType().equals(AmazonCloudSearchConfig.NODE_KEEPMETADATA)) {
- String value = sn.getAttributeValue(AmazonCloudSearchConfig.ATTRIBUTE_VALUE);
- keepAllMetadata = Boolean.parseBoolean(value);
- } else if (sn.getType().equals(AmazonCloudSearchConfig.NODE_FIELDMAP)) {
- String source = sn.getAttributeValue(AmazonCloudSearchConfig.ATTRIBUTE_SOURCE);
- String target = sn.getAttributeValue(AmazonCloudSearchConfig.ATTRIBUTE_TARGET);
-
- if (target == null) {
- target = "";
- }
- sourceTargets.put(source, target);
- } else if (sn.getType().equals(AmazonCloudSearchConfig.NODE_MIMETYPES)) {
+ if (sn.getType().equals(AmazonCloudSearchConfig.NODE_MIMETYPES)) {
mimeTypes = sn.getValue();
} else if (sn.getType().equals(AmazonCloudSearchConfig.NODE_EXTENSIONS)) {
extensions = sn.getValue();
@@ -1089,7 +968,6 @@ public class AmazonCloudSearchConnector
lengthCutoff = new Long(value);
}
}
- this.keepAllMetadata = keepAllMetadata;
this.lengthCutoff = lengthCutoff;
fillSet(this.extensions, extensions);
fillSet(this.mimeTypes, mimeTypes);
@@ -1099,21 +977,6 @@ public class AmazonCloudSearchConnector
int index = 0;
- // Mappings
- final List<String> packedMappings = new ArrayList<String>();
- index = unpackList(packedMappings,packedString,index,'+');
- String[] fixedList = new String[2];
- for (String packedMapping : packedMappings) {
- unpackFixedList(fixedList,packedMapping,0,':');
- sourceTargets.put(fixedList[0], fixedList[1]);
- }
-
- // Keep all metadata
- if (packedString.length() > index)
- keepAllMetadata = (packedString.charAt(index++) == '+');
- else
- keepAllMetadata = true;
-
// Max length
final StringBuilder sb = new StringBuilder();
if (packedString.length() > index) {
@@ -1144,32 +1007,6 @@ public class AmazonCloudSearchConnector
StringBuilder sb = new StringBuilder();
int i;
- // Mappings
- final String[] sortArray = new String[sourceTargets.size()];
- i = 0;
- for (String source : sourceTargets.keySet()) {
- sortArray[i++] = source;
- }
- java.util.Arrays.sort(sortArray);
-
- List<String> packedMappings = new ArrayList<String>();
- String[] fixedList = new String[2];
- for (String source : sortArray) {
- String target = sourceTargets.get(source);
- StringBuilder localBuffer = new StringBuilder();
- fixedList[0] = source;
- fixedList[1] = target;
- packFixedList(localBuffer,fixedList,':');
- packedMappings.add(localBuffer.toString());
- }
- packList(sb,packedMappings,'+');
-
- // Keep all metadata
- if (keepAllMetadata)
- sb.append('+');
- else
- sb.append('-');
-
// Max length
if (lengthCutoff == null)
sb.append('-');
@@ -1218,13 +1055,6 @@ public class AmazonCloudSearchConnector
return extensions.contains(extension);
}
- public String getMapping(String source) {
- return sourceTargets.get(source);
- }
-
- public boolean keepAllMetadata() {
- return keepAllMetadata;
- }
}
}
Modified: manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/amazoncloudsearch/DocumentChunkManager.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/amazoncloudsearch/DocumentChunkManager.java?rev=1604061&r1=1604060&r2=1604061&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/amazoncloudsearch/DocumentChunkManager.java (original)
+++ manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/amazoncloudsearch/DocumentChunkManager.java Fri Jun 20 00:57:13 2014
@@ -152,13 +152,13 @@ public class DocumentChunkManager extend
IResultSet set = performQuery("SELECT "+UID_FIELD+" FROM "+getTableName()+" WHERE "+
query+" FOR UPDATE",params,null,null);
- Map<String,String> parameterMap = new HashMap<String,String>();
+ Map<String,Object> parameterMap = new HashMap<String,Object>();
parameterMap.put(SDF_DATA_FIELD, tfi);
//if record exists on table, update record.
if(set.getRowCount() > 0)
{
- performUpdate(parameterMap, " WHERE "+query, whereParameters, null);
+ performUpdate(parameterMap, " WHERE "+query, params, null);
}
else
{
@@ -258,7 +258,7 @@ public class DocumentChunkManager extend
new UnitaryClause(HOST_FIELD,host),
new UnitaryClause(PATH_FIELD,path),
new UnitaryClause(UID_FIELD,uid)});
- performDelete("WHERE "+query,params,null,null);
+ performDelete("WHERE "+query,params,null);
}
break;
Modified: manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/amazoncloudsearch/DocumentRecord.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/amazoncloudsearch/DocumentRecord.java?rev=1604061&r1=1604060&r2=1604061&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/amazoncloudsearch/DocumentRecord.java (original)
+++ manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/amazoncloudsearch/DocumentRecord.java Fri Jun 20 00:57:13 2014
@@ -18,7 +18,7 @@
*/
package org.apache.manifoldcf.agents.output.amazoncloudsearch;
-import org.apache.manifoldcf.core.*;
+import org.apache.manifoldcf.core.interfaces.*;
import java.io.*;
Modified: manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/amazoncloudsearch/editSpecification.js
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/amazoncloudsearch/editSpecification.js?rev=1604061&r1=1604060&r2=1604061&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/amazoncloudsearch/editSpecification.js (original)
+++ manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/amazoncloudsearch/editSpecification.js Fri Jun 20 00:57:13 2014
@@ -22,30 +22,5 @@ function s${SEQNUM}_checkSpecification()
return true;
}
-function s${SEQNUM}_addFieldMapping()
-{
- if (editjob.s${SEQNUM}_cloudsearch_fieldmapping_source.value == "")
- {
- alert("$Encoder.bodyEscape($ResourceBundle.getString('AmazonCloudSearchOutputConnector.NoFieldMappingSpecified'))");
- editjob.s${SEQNUM}_cloudsearch_fieldmapping_source.focus();
- return;
- }
- editjob.s${SEQNUM}_cloudsearch_fieldmapping_op.value="Add";
- postFormSetAnchor("s${SEQNUM}_cloudsearch_fieldmapping");
-}
-
-function s${SEQNUM}_deleteFieldMapping(i)
-{
- // Set the operation
- eval("editjob.s${SEQNUM}_cloudsearch_fieldmapping_op_"+i+".value=\"Delete\"");
- // Submit
- if (editjob.s${SEQNUM}_cloudsearch_fieldmapping_count.value==i)
- postFormSetAnchor("s${SEQNUM}_cloudsearch_fieldmapping");
- else
- postFormSetAnchor("s${SEQNUM}_cloudsearch_fieldmapping_"+i)
- // Undo, so we won't get two deletes next time
- eval("editjob.s${SEQNUM}_cloudsearch_fieldmapping_op_"+i+".value=\"Continue\"");
-}
-
//-->
</script>
Modified: manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/amazoncloudsearch/viewSpecification.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/amazoncloudsearch/viewSpecification.html?rev=1604061&r1=1604060&r2=1604061&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/amazoncloudsearch/viewSpecification.html (original)
+++ manifoldcf/branches/CONNECTORS-954/connectors/amazoncloudsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/amazoncloudsearch/viewSpecification.html Fri Jun 20 00:57:13 2014
@@ -29,42 +29,4 @@
<td class="value">$Encoder.bodyEscape($EXTENSIONS)</td>
</tr>
- <tr><td class="separator" colspan="2"><hr/></td></tr>
-
- <tr>
- <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('AmazonCloudSearchOutputConnector.FieldMappings'))</nobr></td>
- <td class="boxcell">
- <table class="formtable">
- <tr class="formheaderrow">
- <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('AmazonCloudSearchOutputConnector.MetadataFieldName'))</nobr></td>
- <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('AmazonCloudSearchOutputConnector.CloudSearchFieldName'))</nobr></td>
- </tr>
-#set($fieldcounter = 0)
-#foreach($fieldmapping in $FIELDMAPPINGS)
- #if(($fieldcounter % 2) == 0)
- <tr class="evenformrow">
- #else
- <tr class="oddformrow">
- #end
- <td class="formcolumncell">
- <nobr>$Encoder.bodyEscape($fieldmapping.get('SOURCE'))</nobr>
- </td>
- <td class="formcolumncell">
- <nobr>$Encoder.bodyEscape($fieldmapping.get('TARGETDISPLAY'))</nobr>
- </td>
- </tr>
- #set($fieldcounter = $fieldcounter + 1)
-#end
-#if($fieldcounter == 0)
- <tr class="formrow"><td class="formmessage" colspan="2">$Encoder.bodyEscape($ResourceBundle.getString('AmazonCloudSearchOutputConnector.NoFieldMappingSpecified'))</td></tr>
-#end
- </table>
- </td>
- </tr>
- <tr><td class="separator" colspan="2"><hr/></td></tr>
- <tr>
- <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('AmazonCloudSearchOutputConnector.KeepAllMetadata'))</nobr></td>
- <td class="value"><nobr>$Encoder.bodyEscape($KEEPALLMETADATA)</nobr></td>
- </tr>
-
</table>
Modified: manifoldcf/branches/CONNECTORS-954/framework/core/src/main/java/org/apache/manifoldcf/core/jsongen/JSONArrayReader.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-954/framework/core/src/main/java/org/apache/manifoldcf/core/jsongen/JSONArrayReader.java?rev=1604061&r1=1604060&r2=1604061&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-954/framework/core/src/main/java/org/apache/manifoldcf/core/jsongen/JSONArrayReader.java (original)
+++ manifoldcf/branches/CONNECTORS-954/framework/core/src/main/java/org/apache/manifoldcf/core/jsongen/JSONArrayReader.java Fri Jun 20 00:57:13 2014
@@ -37,6 +37,14 @@ public class JSONArrayReader extends JSO
{
}
+ public JSONArrayReader(JSONReader[] elements)
+ {
+ for (JSONReader element : elements)
+ {
+ addArrayElement(element);
+ }
+ }
+
public JSONArrayReader addArrayElement(JSONReader element)
{
elements.add(element);
Modified: manifoldcf/branches/CONNECTORS-954/framework/core/src/main/java/org/apache/manifoldcf/core/jsongen/JSONNameValueReader.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-954/framework/core/src/main/java/org/apache/manifoldcf/core/jsongen/JSONNameValueReader.java?rev=1604061&r1=1604060&r2=1604061&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-954/framework/core/src/main/java/org/apache/manifoldcf/core/jsongen/JSONNameValueReader.java (original)
+++ manifoldcf/branches/CONNECTORS-954/framework/core/src/main/java/org/apache/manifoldcf/core/jsongen/JSONNameValueReader.java Fri Jun 20 00:57:13 2014
@@ -21,7 +21,7 @@ package org.apache.manifoldcf.core.jsong
import java.io.*;
/** This class describes a JSON name/value object reader. */
-public class JSONNameValueReader extends JSONObjectReader
+public class JSONNameValueReader extends JSONReader
{
protected final static int STATE_NAME = 0;
protected final static int STATE_VALUE = 1;
@@ -32,7 +32,7 @@ public class JSONNameValueReader extends
protected int state = STATE_NAME;
- public JSONNameValueReader(JSONStringReader name, JSONObjectReader value)
+ public JSONNameValueReader(JSONStringReader name, JSONReader value)
{
this.name = name;
this.value = value;
Modified: manifoldcf/branches/CONNECTORS-954/framework/core/src/main/java/org/apache/manifoldcf/core/jsongen/JSONValueReader.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-954/framework/core/src/main/java/org/apache/manifoldcf/core/jsongen/JSONValueReader.java?rev=1604061&r1=1604060&r2=1604061&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-954/framework/core/src/main/java/org/apache/manifoldcf/core/jsongen/JSONValueReader.java (original)
+++ manifoldcf/branches/CONNECTORS-954/framework/core/src/main/java/org/apache/manifoldcf/core/jsongen/JSONValueReader.java Fri Jun 20 00:57:13 2014
@@ -26,7 +26,7 @@ public class JSONValueReader extends JSO
/** Wrapped reader */
protected final Reader value;
- protected JSONValueReader(Reader value)
+ public JSONValueReader(Reader value)
{
this.value = value;
}