Modified: manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java?rev=1622740&r1=1622739&r2=1622740&view=diff ============================================================================== --- manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java (original) +++ manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java Fri Sep 5 16:48:06 2014 @@ -2930,126 +2930,128 @@ public class SharedDriveConnector extend tabsArray.add(Messages.getString(locale,"SharedDriveConnector.ContentLength")); tabsArray.add(Messages.getString(locale,"SharedDriveConnector.FileMapping")); tabsArray.add(Messages.getString(locale,"SharedDriveConnector.URLMapping")); + String seqPrefix = "s"+connectionSequenceNumber+"_"; + out.print( "<script type=\"text/javascript\">\n"+ "//<!--\n"+ "\n"+ -"function checkSpecification()\n"+ +"function "+seqPrefix+"checkSpecification()\n"+ "{\n"+ -" if (editjob.specmaxlength.value != \"\" && !isInteger(editjob.specmaxlength.value))\n"+ +" if (editjob."+seqPrefix+"specmaxlength.value != \"\" && !isInteger(editjob."+seqPrefix+"specmaxlength.value))\n"+ " {\n"+ " alert(\"" + Messages.getBodyJavascriptString(locale,"SharedDriveConnector.NeedAValidNumberForMaximumDocumentLength") + "\");\n"+ -" editjob.specmaxlength.focus();\n"+ +" editjob."+seqPrefix+"specmaxlength.focus();\n"+ " return false;\n"+ " }\n"+ " return true;\n"+ "}\n"+ "\n"+ -"function SpecOp(n, opValue, anchorvalue)\n"+ +"function "+seqPrefix+"SpecOp(n, opValue, anchorvalue)\n"+ "{\n"+ " eval(\"editjob.\"+n+\".value = \\\"\"+opValue+\"\\\"\");\n"+ " postFormSetAnchor(anchorvalue);\n"+ "}\n"+ "\n"+ -"function SpecAddToPath(anchorvalue)\n"+ +"function "+seqPrefix+"SpecAddToPath(anchorvalue)\n"+ "{\n"+ -" if (editjob.pathaddon.value == \"\" && editjob.pathtypein.value == \"\")\n"+ +" if (editjob."+seqPrefix+"pathaddon.value == \"\" && editjob."+seqPrefix+"pathtypein.value == \"\")\n"+ " {\n"+ " alert(\"" + Messages.getBodyJavascriptString(locale,"SharedDriveConnector.SelectAFolderOrTypeInAPathFirst") + "\");\n"+ -" editjob.pathaddon.focus();\n"+ +" editjob."+seqPrefix+"pathaddon.focus();\n"+ " return;\n"+ " }\n"+ -" if (editjob.pathaddon.value != \"\" && editjob.pathtypein.value != \"\")\n"+ +" if (editjob."+seqPrefix+"pathaddon.value != \"\" && editjob."+seqPrefix+"pathtypein.value != \"\")\n"+ " {\n"+ " alert(\"" + Messages.getBodyJavascriptString(locale,"SharedDriveConnector.EitherSelectAFolderORTypeInAPath") + "\");\n"+ -" editjob.pathaddon.focus();\n"+ +" editjob."+seqPrefix+"pathaddon.focus();\n"+ " return;\n"+ " }\n"+ -" SpecOp(\"pathop\",\"AddToPath\",anchorvalue);\n"+ +" "+seqPrefix+"SpecOp(\""+seqPrefix+"pathop\",\"AddToPath\",anchorvalue);\n"+ "}\n"+ "\n"+ -"function SpecAddSpec(suffix,anchorvalue)\n"+ +"function "+seqPrefix+"SpecAddSpec(suffix,anchorvalue)\n"+ "{\n"+ -" if (eval(\"editjob.specfile\"+suffix+\".value\") == \"\")\n"+ +" if (eval(\"editjob."+seqPrefix+"specfile\"+suffix+\".value\") == \"\")\n"+ " {\n"+ " alert(\"" + Messages.getBodyJavascriptString(locale,"SharedDriveConnector.EnterAFileSpecificationFirst") + "\");\n"+ -" eval(\"editjob.specfile\"+suffix+\".focus()\");\n"+ +" eval(\"editjob."+seqPrefix+"specfile\"+suffix+\".focus()\");\n"+ " return;\n"+ " }\n"+ -" SpecOp(\"pathop\"+suffix,\"Add\",anchorvalue);\n"+ +" "+seqPrefix+"SpecOp(\""+seqPrefix+"pathop\"+suffix,\"Add\",anchorvalue);\n"+ "}\n"+ "\n"+ -"function SpecInsertSpec(postfix,anchorvalue)\n"+ +"function "+seqPrefix+"SpecInsertSpec(postfix,anchorvalue)\n"+ "{\n"+ -" if (eval(\"editjob.specfile_i\"+postfix+\".value\") == \"\")\n"+ +" if (eval(\"editjob."+seqPrefix+"specfile_i\"+postfix+\".value\") == \"\")\n"+ " {\n"+ " alert(\"" + Messages.getBodyJavascriptString(locale,"SharedDriveConnector.EnterAFileSpecificationFirst") + "\");\n"+ -" eval(\"editjob.specfile_i\"+postfix+\".focus()\");\n"+ +" eval(\"editjob."+seqPrefix+"specfile_i\"+postfix+\".focus()\");\n"+ " return;\n"+ " }\n"+ -" SpecOp(\"specop\"+postfix,\"Insert Here\",anchorvalue);\n"+ +" "+seqPrefix+"SpecOp(\""+seqPrefix+"specop\"+postfix,\"Insert Here\",anchorvalue);\n"+ "}\n"+ "\n"+ -"function SpecAddToken(anchorvalue)\n"+ +"function "+seqPrefix+"SpecAddToken(anchorvalue)\n"+ "{\n"+ -" if (editjob.spectoken.value == \"\")\n"+ +" if (editjob."+seqPrefix+"spectoken.value == \"\")\n"+ " {\n"+ " alert(\"" + Messages.getBodyJavascriptString(locale,"SharedDriveConnector.NullAccessTokensNotAllowed") + "\");\n"+ -" editjob.spectoken.focus();\n"+ +" editjob."+seqPrefix+"spectoken.focus();\n"+ " return;\n"+ " }\n"+ -" SpecOp(\"accessop\",\"Add\",anchorvalue);\n"+ +" "+seqPrefix+"SpecOp(\""+seqPrefix+"accessop\",\"Add\",anchorvalue);\n"+ "}\n"+ "\n"+ -"function SpecAddMapping(anchorvalue)\n"+ +"function "+seqPrefix+"SpecAddMapping(anchorvalue)\n"+ "{\n"+ -" if (editjob.specmatch.value == \"\")\n"+ +" if (editjob."+seqPrefix+"specmatch.value == \"\")\n"+ " {\n"+ " alert(\"" + Messages.getBodyJavascriptString(locale,"SharedDriveConnector.MatchStringCannotBeEmpty") + "\");\n"+ -" editjob.specmatch.focus();\n"+ +" editjob."+seqPrefix+"specmatch.focus();\n"+ " return;\n"+ " }\n"+ -" if (!isRegularExpression(editjob.specmatch.value))\n"+ +" if (!isRegularExpression(editjob."+seqPrefix+"specmatch.value))\n"+ " {\n"+ " alert(\"" + Messages.getBodyJavascriptString(locale,"SharedDriveConnector.MatchStringMustBeValidRegularExpression") + "\");\n"+ -" editjob.specmatch.focus();\n"+ +" editjob."+seqPrefix+"specmatch.focus();\n"+ " return;\n"+ " }\n"+ -" SpecOp(\"specmappingop\",\"Add\",anchorvalue);\n"+ +" "+seqPrefix+"SpecOp(\""+seqPrefix+"specmappingop\",\"Add\",anchorvalue);\n"+ "}\n"+ "\n"+ -"function SpecAddFMap(anchorvalue)\n"+ +"function "+seqPrefix+"SpecAddFMap(anchorvalue)\n"+ "{\n"+ -" if (editjob.specfmapmatch.value == \"\")\n"+ +" if (editjob."+seqPrefix+"specfmapmatch.value == \"\")\n"+ " {\n"+ " alert(\"" + Messages.getBodyJavascriptString(locale,"SharedDriveConnector.MatchStringCannotBeEmpty") + "\");\n"+ -" editjob.specfmapmatch.focus();\n"+ +" editjob."+seqPrefix+"specfmapmatch.focus();\n"+ " return;\n"+ " }\n"+ -" if (!isRegularExpression(editjob.specfmapmatch.value))\n"+ +" if (!isRegularExpression(editjob."+seqPrefix+"specfmapmatch.value))\n"+ " {\n"+ " alert(\"" + Messages.getBodyJavascriptString(locale,"SharedDriveConnector.MatchStringMustBeValidRegularExpression") + "\");\n"+ -" editjob.specfmapmatch.focus();\n"+ +" editjob."+seqPrefix+"specfmapmatch.focus();\n"+ " return;\n"+ " }\n"+ -" SpecOp(\"specfmapop\",\"Add\",anchorvalue);\n"+ +" "+seqPrefix+"SpecOp(\""+seqPrefix+"specfmapop\",\"Add\",anchorvalue);\n"+ "}\n"+ "\n"+ -"function SpecAddUMap(anchorvalue)\n"+ +"function "+seqPrefix+"SpecAddUMap(anchorvalue)\n"+ "{\n"+ -" if (editjob.specumapmatch.value == \"\")\n"+ +" if (editjob."+seqPrefix+"specumapmatch.value == \"\")\n"+ " {\n"+ " alert(\"" + Messages.getBodyJavascriptString(locale,"SharedDriveConnector.MatchStringCannotBeEmpty") + "\");\n"+ -" editjob.specumapmatch.focus();\n"+ +" editjob."+seqPrefix+"specumapmatch.focus();\n"+ " return;\n"+ " }\n"+ -" if (!isRegularExpression(editjob.specumapmatch.value))\n"+ +" if (!isRegularExpression(editjob."+seqPrefix+"specumapmatch.value))\n"+ " {\n"+ " alert(\"" + Messages.getBodyJavascriptString(locale,"SharedDriveConnector.MatchStringMustBeValidRegularExpression") + "\");\n"+ -" editjob.specumapmatch.focus();\n"+ +" editjob."+seqPrefix+"specumapmatch.focus();\n"+ " return;\n"+ " }\n"+ -" SpecOp(\"specumapop\",\"Add\",anchorvalue);\n"+ +" "+seqPrefix+"SpecOp(\""+seqPrefix+"specumapop\",\"Add\",anchorvalue);\n"+ "}\n"+ "\n"+ "//-->\n"+ @@ -3076,6 +3078,8 @@ public class SharedDriveConnector extend int connectionSequenceNumber, int actualSequenceNumber, String tabName) throws ManifoldCFException, IOException { + String seqPrefix = "s"+connectionSequenceNumber+"_"; + int i; int k; @@ -3091,14 +3095,14 @@ public class SharedDriveConnector extend if (maxLength == null) maxLength = ""; - if (tabName.equals(Messages.getString(locale,"SharedDriveConnector.ContentLength"))) + if (tabName.equals(Messages.getString(locale,"SharedDriveConnector.ContentLength")) && connectionSequenceNumber == actualSequenceNumber) { out.print( "<table class=\"displaytable\">\n"+ " <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+ " <tr>\n"+ " <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"SharedDriveConnector.MaximumDocumentLength") + "</nobr></td>\n"+ -" <td class=\"value\"><input type=\"text\" name=\"specmaxlength\" size=\"10\" value=\""+maxLength+"\"/></td>\n"+ +" <td class=\"value\"><input type=\"text\" name=\""+seqPrefix+"specmaxlength\" size=\"10\" value=\""+maxLength+"\"/></td>\n"+ " </tr>\n"+ "</table>\n" ); @@ -3106,12 +3110,12 @@ public class SharedDriveConnector extend else { out.print( -"<input type=\"hidden\" name=\"specmaxlength\" value=\""+maxLength+"\"/>\n" +"<input type=\"hidden\" name=\""+seqPrefix+"specmaxlength\" value=\""+maxLength+"\"/>\n" ); } // Check for Paths tab - if (tabName.equals(Messages.getString(locale,"SharedDriveConnector.Paths"))) + if (tabName.equals(Messages.getString(locale,"SharedDriveConnector.Paths")) && connectionSequenceNumber == actualSequenceNumber) { out.print( "<table class=\"displaytable\">\n"+ @@ -3128,20 +3132,20 @@ public class SharedDriveConnector extend if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.NODE_STARTPOINT)) { String pathDescription = "_"+Integer.toString(k); - String pathOpName = "pathop"+pathDescription; + String pathOpName = seqPrefix+"pathop"+pathDescription; String startPath = sn.getAttributeValue(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_PATH); out.print( " <tr>\n"+ " <td class=\"value\">\n"+ -" <a name=\""+"path_"+Integer.toString(k)+"\">\n"+ -" <input type=\"button\" value=\"Delete\" alt=\""+Messages.getAttributeString(locale,"SharedDriveConnector.DeletePath")+Integer.toString(k)+"\" onClick='Javascript:SpecOp(\""+pathOpName+"\",\"Delete\",\"path_"+Integer.toString(k)+"\")'/>\n"+ +" <a name=\""+seqPrefix+"path_"+Integer.toString(k)+"\">\n"+ +" <input type=\"button\" value=\"Delete\" alt=\""+Messages.getAttributeString(locale,"SharedDriveConnector.DeletePath")+Integer.toString(k)+"\" onClick='Javascript:"+seqPrefix+"SpecOp(\""+pathOpName+"\",\"Delete\",\""+seqPrefix+"path_"+Integer.toString(k)+"\")'/>\n"+ " </a> \n"+ " </td>\n"+ " <td class=\"value\">\n"+ " <table class=\"displaytable\">\n"+ " <tr>\n"+ " <td class=\"value\">\n"+ -" <input type=\"hidden\" name=\""+"specpath"+pathDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(sn.getAttributeValue(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_PATH))+"\"/>\n"+ +" <input type=\"hidden\" name=\""+seqPrefix+"specpath"+pathDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(sn.getAttributeValue(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_PATH))+"\"/>\n"+ " <input type=\"hidden\" name=\""+pathOpName+"\" value=\"\"/>\n"+ " <nobr>"+((startPath.length() == 0)?"(root)":org.apache.manifoldcf.ui.util.Encoder.bodyEscape(startPath))+"</nobr>\n"+ " </td>\n"+ @@ -3157,7 +3161,7 @@ public class SharedDriveConnector extend { SpecificationNode excludeNode = sn.getChild(j); String instanceDescription = "_"+Integer.toString(k)+"_"+Integer.toString(j); - String instanceOpName = "specop" + instanceDescription; + String instanceOpName = seqPrefix + "specop" + instanceDescription; String nodeFlavor = excludeNode.getType(); String nodeType = excludeNode.getAttributeValue(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_TYPE); @@ -3170,39 +3174,39 @@ public class SharedDriveConnector extend out.print( " <tr>\n"+ " <td class=\"value\">\n"+ -" <input type=\"button\" value=\"Insert\" onClick='Javascript:SpecInsertSpec(\""+instanceDescription+"\",\"filespec_"+Integer.toString(k)+"_"+Integer.toString(j+1)+"\")' alt=\""+Messages.getAttributeString(locale,"SharedDriveConnector.InsertNewMatchForPath")+Integer.toString(k)+" before position #"+Integer.toString(j)+"\"/>\n"+ +" <input type=\"button\" value=\"Insert\" onClick='Javascript:"+seqPrefix+"SpecInsertSpec(\""+instanceDescription+"\",\""+seqPrefix+"filespec_"+Integer.toString(k)+"_"+Integer.toString(j+1)+"\")' alt=\""+Messages.getAttributeString(locale,"SharedDriveConnector.InsertNewMatchForPath")+Integer.toString(k)+" before position #"+Integer.toString(j)+"\"/>\n"+ " </td>\n"+ " <td class=\"value\">\n"+ " <nobr>\n"+ -" <select name=\""+"specfl_i"+instanceDescription+"\">\n"+ +" <select name=\""+seqPrefix+"specfl_i"+instanceDescription+"\">\n"+ " <option value=\"include\">" + Messages.getBodyString(locale,"SharedDriveConnector.Include") + "</option>\n"+ " <option value=\"exclude\">" + Messages.getBodyString(locale,"SharedDriveConnector.Exclude") + "</option>\n"+ " </select> \n"+ -" <select name=\""+"spectin_i"+instanceDescription+"\">\n"+ +" <select name=\""+seqPrefix+"spectin_i"+instanceDescription+"\">\n"+ " <option value=\"\" selected=\"selected\">" + Messages.getBodyString(locale,"SharedDriveConnector.AnyFileOrDirectory") + "</option>\n"+ " <option value=\"file\">" + Messages.getBodyString(locale,"SharedDriveConnector.files") + "</option>\n"+ " <option value=\"indexable-file\">" + Messages.getBodyString(locale,"SharedDriveConnector.indexableFiles") + "</option>\n"+ " <option value=\"unindexable-file\">" + Messages.getBodyString(locale,"SharedDriveConnector.unindexableFiles") + "</option>\n"+ " <option value=\"directory\">" + Messages.getBodyString(locale,"SharedDriveConnector.directorys") + "</option>\n"+ " </select> " + Messages.getBodyString(locale,"SharedDriveConnector.matching") + " \n"+ -" <input type=\"text\" size=\"20\" name=\""+"specfile_i"+instanceDescription+"\" value=\"\"/>\n"+ +" <input type=\"text\" size=\"20\" name=\""+seqPrefix+"specfile_i"+instanceDescription+"\" value=\"\"/>\n"+ " </nobr>\n"+ " </td>\n"+ "\n"+ " </tr>\n"+ " <tr>\n"+ " <td class=\"value\">\n"+ -" <a name=\""+"filespec_"+Integer.toString(k)+"_"+Integer.toString(j)+"\">\n"+ -" <input type=\"button\" value=\"Delete\" onClick='Javascript:SpecOp(\""+"specop"+instanceDescription+"\",\"Delete\",\"filespec_"+Integer.toString(k)+"_"+Integer.toString(j)+"\")' alt=\""+Messages.getAttributeString(locale,"SharedDriveConnector.DeletePath")+Integer.toString(k)+Messages.getAttributeString(locale,"SharedDriveConnector.matchSpec")+Integer.toString(j)+"\"/>\n"+ +" <a name=\""+seqPrefix+"filespec_"+Integer.toString(k)+"_"+Integer.toString(j)+"\">\n"+ +" <input type=\"button\" value=\"Delete\" onClick='Javascript:"+seqPrefix+"SpecOp(\""+instanceOpName+"\",\"Delete\",\""+seqPrefix+"filespec_"+Integer.toString(k)+"_"+Integer.toString(j)+"\")' alt=\""+Messages.getAttributeString(locale,"SharedDriveConnector.DeletePath")+Integer.toString(k)+Messages.getAttributeString(locale,"SharedDriveConnector.matchSpec")+Integer.toString(j)+"\"/>\n"+ " </a>\n"+ " </td>\n"+ " <td class=\"value\">\n"+ " <nobr>\n"+ -" <input type=\"hidden\" name=\""+"specop"+instanceDescription+"\" value=\"\"/>\n"+ -" <input type=\"hidden\" name=\""+"specfl"+instanceDescription+"\" value=\""+nodeFlavor+"\"/>\n"+ -" <input type=\"hidden\" name=\""+"specty"+instanceDescription+"\" value=\""+nodeType+"\"/>\n"+ -" <input type=\"hidden\" name=\""+"specin"+instanceDescription+"\" value=\""+indexable+"\"/>\n"+ -" <input type=\"hidden\" name=\""+"specfile"+instanceDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(filespec)+"\"/>\n"+ +" <input type=\"hidden\" name=\""+instanceOpName+"\" value=\"\"/>\n"+ +" <input type=\"hidden\" name=\""+seqPrefix+"specfl"+instanceDescription+"\" value=\""+nodeFlavor+"\"/>\n"+ +" <input type=\"hidden\" name=\""+seqPrefix+"specty"+instanceDescription+"\" value=\""+nodeType+"\"/>\n"+ +" <input type=\"hidden\" name=\""+seqPrefix+"specin"+instanceDescription+"\" value=\""+indexable+"\"/>\n"+ +" <input type=\"hidden\" name=\""+seqPrefix+"specfile"+instanceDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(filespec)+"\"/>\n"+ " "+Integer.toString(j+1)+". "+(nodeFlavor.equals("include")?"Include":"")+""+(nodeFlavor.equals("exclude")?"Exclude":"")+""+(indexable.equals("yes")?" indexable":"")+""+(indexable.equals("no")?" un-indexable":"")+""+(nodeType.equals("file")?" file(s)":"")+""+(nodeType.equals("directory")?" directory(s)":"")+""+(nodeType.equals("")?" file(s) or directory(s)":"")+" matching "+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(filespec)+"\n"+ " </nobr>\n"+ " </td>\n"+ @@ -3220,25 +3224,25 @@ public class SharedDriveConnector extend " <tr><td class=\"lightseparator\" colspan=\"2\"><hr/></td></tr>\n"+ " <tr>\n"+ " <td class=\"value\">\n"+ -" <input type=\"hidden\" name=\""+"specchildcount"+pathDescription+"\" value=\""+Integer.toString(j)+"\"/>\n"+ -" <a name=\""+"filespec_"+Integer.toString(k)+"_"+Integer.toString(j)+"\">\n"+ -" <input type=\"button\" value=\"Add\" onClick='Javascript:SpecAddSpec(\""+pathDescription+"\",\"filespec_"+Integer.toString(k)+"_"+Integer.toString(j+1)+"\")' alt=\""+Messages.getAttributeString(locale,"SharedDriveConnector.AddNewMatchForPath")+Integer.toString(k)+"\"/>\n"+ +" <input type=\"hidden\" name=\""+seqPrefix+"specchildcount"+pathDescription+"\" value=\""+Integer.toString(j)+"\"/>\n"+ +" <a name=\""+seqPrefix+"filespec_"+Integer.toString(k)+"_"+Integer.toString(j)+"\">\n"+ +" <input type=\"button\" value=\"Add\" onClick='Javascript:"+seqPrefix+"SpecAddSpec(\""+pathDescription+"\",\""+seqPrefix+"filespec_"+Integer.toString(k)+"_"+Integer.toString(j+1)+"\")' alt=\""+Messages.getAttributeString(locale,"SharedDriveConnector.AddNewMatchForPath")+Integer.toString(k)+"\"/>\n"+ " </a>\n"+ " </td>\n"+ " <td class=\"value\">\n"+ " <nobr>\n"+ -" <select name=\""+"specfl"+pathDescription+"\">\n"+ +" <select name=\""+seqPrefix+"specfl"+pathDescription+"\">\n"+ " <option value=\"include\">" + Messages.getBodyString(locale,"SharedDriveConnector.Include") + "</option>\n"+ " <option value=\"exclude\">" + Messages.getBodyString(locale,"SharedDriveConnector.Exclude") + "</option>\n"+ " </select> \n"+ -" <select name=\""+"spectin"+pathDescription+"\">\n"+ +" <select name=\""+seqPrefix+"spectin"+pathDescription+"\">\n"+ " <option value=\"\">" + Messages.getBodyString(locale,"SharedDriveConnector.AnyFileOrDirectory") + "</option>\n"+ " <option value=\"file\">" + Messages.getBodyString(locale,"SharedDriveConnector.files") + "</option>\n"+ " <option value=\"indexable-file\">" + Messages.getBodyString(locale,"SharedDriveConnector.indexableFiles") + "</option>\n"+ " <option value=\"unindexable-file\">" + Messages.getBodyString(locale,"SharedDriveConnector.unindexableFiles") + "</option>\n"+ " <option value=\"directory\">" + Messages.getBodyString(locale,"SharedDriveConnector.directorys") + "</option>\n"+ " </select> " + Messages.getBodyString(locale,"SharedDriveConnector.matching") + " \n"+ -" <input type=\"text\" size=\"20\" name=\""+"specfile"+pathDescription+"\" value=\"\"/>\n"+ +" <input type=\"text\" size=\"20\" name=\""+seqPrefix+"specfile"+pathDescription+"\" value=\"\"/>\n"+ " </nobr>\n"+ " </td>\n"+ " </tr>\n"+ @@ -3265,11 +3269,11 @@ public class SharedDriveConnector extend " <tr>\n"+ " <td class=\"value\" colspan=\"2\">\n"+ " <nobr>\n"+ -" <input type=\"hidden\" name=\"pathcount\" value=\""+Integer.toString(k)+"\"/>\n"+ -" <a name=\""+"path_"+Integer.toString(k)+"\">\n" +" <input type=\"hidden\" name=\""+seqPrefix+"pathcount\" value=\""+Integer.toString(k)+"\"/>\n"+ +" <a name=\""+seqPrefix+"path_"+Integer.toString(k)+"\">\n" ); - String pathSoFar = (String)currentContext.get("specpath"); + String pathSoFar = (String)currentContext.get(seqPrefix+"specpath"); if (pathSoFar == null) pathSoFar = ""; @@ -3287,23 +3291,23 @@ public class SharedDriveConnector extend throw new ManifoldCFException("Can't find any children for root folder"); } out.print( -" <input type=\"hidden\" name=\"specpath\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(pathSoFar)+"\"/>\n"+ -" <input type=\"hidden\" name=\"pathop\" value=\"\"/>\n"+ -" <input type=\"button\" value=\"Add\" alt=\"" + Messages.getAttributeString(locale,"SharedDriveConnector.AddPath") + "\" onClick='Javascript:SpecOp(\"pathop\",\"Add\",\"path_"+Integer.toString(k+1)+"\")'/>\n"+ +" <input type=\"hidden\" name=\""+seqPrefix+"specpath\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(pathSoFar)+"\"/>\n"+ +" <input type=\"hidden\" name=\""+seqPrefix+"pathop\" value=\"\"/>\n"+ +" <input type=\"button\" value=\"Add\" alt=\"" + Messages.getAttributeString(locale,"SharedDriveConnector.AddPath") + "\" onClick='Javascript:"+seqPrefix+"SpecOp(\""+seqPrefix+"pathop\",\"Add\",\""+seqPrefix+"path_"+Integer.toString(k+1)+"\")'/>\n"+ " "+((pathSoFar.length()==0)?"(root)":org.apache.manifoldcf.ui.util.Encoder.bodyEscape(pathSoFar))+"\n" ); if (pathSoFar.length() > 0) { out.print( -" <input type=\"button\" value=\"-\" alt=\"" + Messages.getAttributeString(locale,"SharedDriveConnector.RemoveFromPath") + "\" onClick='Javascript:SpecOp(\"pathop\",\"Up\",\"path_"+Integer.toString(k)+"\")'/>\n" +" <input type=\"button\" value=\"-\" alt=\"" + Messages.getAttributeString(locale,"SharedDriveConnector.RemoveFromPath") + "\" onClick='Javascript:"+seqPrefix+"SpecOp(\""+seqPrefix+"pathop\",\"Up\",\""+seqPrefix+"path_"+Integer.toString(k)+"\")'/>\n" ); } if (childList.length > 0) { out.print( " <nobr>\n"+ -" <input type=\"button\" value=\"+\" alt=\"" + Messages.getAttributeString(locale,"SharedDriveConnector.AddPath") + "\" onClick='Javascript:SpecAddToPath(\"path_"+Integer.toString(k)+"\")'/> \n"+ -" <select multiple=\"false\" name=\"pathaddon\" size=\"4\">\n"+ +" <input type=\"button\" value=\"+\" alt=\"" + Messages.getAttributeString(locale,"SharedDriveConnector.AddPath") + "\" onClick='Javascript:"+seqPrefix+"SpecAddToPath(\""+seqPrefix+"path_"+Integer.toString(k)+"\")'/> \n"+ +" <select multiple=\"false\" name=\""+seqPrefix+"pathaddon\" size=\"4\">\n"+ " <option value=\"\" selected=\"selected\">" + Messages.getBodyString(locale,"SharedDriveConnector.PickAFolder") + "</option>\n" ); int j = 0; @@ -3317,7 +3321,7 @@ public class SharedDriveConnector extend } out.print( " </select>" + Messages.getBodyString(locale,"SharedDriveConnector.orTypeAPath") + -" <input type=\"text\" name=\"pathtypein\" size=\"16\" value=\"\"/>\n"+ +" <input type=\"text\" name=\""+seqPrefix+"pathtypein\" size=\"16\" value=\"\"/>\n"+ " </nobr>\n" ); } @@ -3348,7 +3352,7 @@ public class SharedDriveConnector extend String pathDescription = "_"+Integer.toString(k); String startPath = sn.getAttributeValue(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_PATH); out.print( -"<input type=\"hidden\" name=\""+"specpath"+pathDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(startPath)+"\"/>\n" +"<input type=\"hidden\" name=\""+seqPrefix+"specpath"+pathDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(startPath)+"\"/>\n" ); // Now go through the include/exclude children of this node. int j = 0; @@ -3366,21 +3370,21 @@ public class SharedDriveConnector extend if (indexable == null) indexable = ""; out.print( -"<input type=\"hidden\" name=\""+"specfl"+instanceDescription+"\" value=\""+nodeFlavor+"\"/>\n"+ -"<input type=\"hidden\" name=\""+"specty"+instanceDescription+"\" value=\""+nodeType+"\"/>\n"+ -"<input type=\"hidden\" name=\""+"specin"+instanceDescription+"\" value=\""+indexable+"\"/>\n"+ -"<input type=\"hidden\" name=\""+"specfile"+instanceDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(filespec)+"\"/>\n" +"<input type=\"hidden\" name=\""+seqPrefix+"specfl"+instanceDescription+"\" value=\""+nodeFlavor+"\"/>\n"+ +"<input type=\"hidden\" name=\""+seqPrefix+"specty"+instanceDescription+"\" value=\""+nodeType+"\"/>\n"+ +"<input type=\"hidden\" name=\""+seqPrefix+"specin"+instanceDescription+"\" value=\""+indexable+"\"/>\n"+ +"<input type=\"hidden\" name=\""+seqPrefix+"specfile"+instanceDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(filespec)+"\"/>\n" ); j++; } k++; out.print( -"<input type=\"hidden\" name=\""+"specchildcount"+pathDescription+"\" value=\""+Integer.toString(j)+"\"/>\n" +"<input type=\"hidden\" name=\""+seqPrefix+"specchildcount"+pathDescription+"\" value=\""+Integer.toString(j)+"\"/>\n" ); } } out.print( -"<input type=\"hidden\" name=\"pathcount\" value=\""+Integer.toString(k)+"\"/>\n" +"<input type=\"hidden\" name=\""+seqPrefix+"pathcount\" value=\""+Integer.toString(k)+"\"/>\n" ); } @@ -3421,7 +3425,7 @@ public class SharedDriveConnector extend } } - if (tabName.equals(Messages.getString(locale,"SharedDriveConnector.Security"))) + if (tabName.equals(Messages.getString(locale,"SharedDriveConnector.Security")) && connectionSequenceNumber == actualSequenceNumber) { out.print( "<table class=\"displaytable\">\n"+ @@ -3431,8 +3435,8 @@ public class SharedDriveConnector extend " <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"SharedDriveConnector.FileSecurity") + "</nobr></td>\n"+ " <td colspan=\"3\" class=\"value\">\n"+ " <nobr>\n"+ -" <input type=\"radio\" name=\"specsecurity\" value=\"on\" "+(securityOn?"checked=\"true\"":"")+" />" + Messages.getBodyString(locale,"SharedDriveConnector.Enabled") + " \n"+ -" <input type=\"radio\" name=\"specsecurity\" value=\"off\" "+((securityOn==false)?"checked=\"true\"":"")+" />" + Messages.getBodyString(locale,"SharedDriveConnector.Disabled") + "\n"+ +" <input type=\"radio\" name=\""+seqPrefix+"specsecurity\" value=\"on\" "+(securityOn?"checked=\"true\"":"")+" />" + Messages.getBodyString(locale,"SharedDriveConnector.Enabled") + " \n"+ +" <input type=\"radio\" name=\""+seqPrefix+"specsecurity\" value=\"off\" "+((securityOn==false)?"checked=\"true\"":"")+" />" + Messages.getBodyString(locale,"SharedDriveConnector.Disabled") + "\n"+ " </nobr>\n"+ " </td>\n"+ " </tr>\n"+ @@ -3449,15 +3453,15 @@ public class SharedDriveConnector extend if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.NODE_ACCESS)) { String accessDescription = "_"+Integer.toString(k); - String accessOpName = "accessop"+accessDescription; + String accessOpName = seqPrefix+"accessop"+accessDescription; String token = sn.getAttributeValue(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_TOKEN); out.print( " <tr>\n"+ " <td class=\"description\" colspan=\"1\">\n"+ " <input type=\"hidden\" name=\""+accessOpName+"\" value=\"\"/>\n"+ -" <input type=\"hidden\" name=\""+"spectoken"+accessDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(token)+"\"/>\n"+ -" <a name=\""+"token_"+Integer.toString(k)+"\">\n"+ -" <input type=\"button\" value=\"Delete\" alt=\""+Messages.getAttributeString(locale,"SharedDriveConnector.DeleteToken")+Integer.toString(k)+"\" onClick='Javascript:SpecOp(\""+accessOpName+"\",\"Delete\",\"token_"+Integer.toString(k)+"\")'/>\n"+ +" <input type=\"hidden\" name=\""+seqPrefix+"spectoken"+accessDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(token)+"\"/>\n"+ +" <a name=\""+seqPrefix+"token_"+Integer.toString(k)+"\">\n"+ +" <input type=\"button\" value=\"Delete\" alt=\""+Messages.getAttributeString(locale,"SharedDriveConnector.DeleteToken")+Integer.toString(k)+"\" onClick='Javascript:"+seqPrefix+"SpecOp(\""+accessOpName+"\",\"Delete\",\""+seqPrefix+"token_"+Integer.toString(k)+"\")'/>\n"+ " </a>\n"+ " </td>\n"+ " <td class=\"value\" colspan=\"3\">\n"+ @@ -3480,14 +3484,14 @@ public class SharedDriveConnector extend " <tr><td class=\"lightseparator\" colspan=\"4\"><hr/></td></tr>\n"+ " <tr>\n"+ " <td class=\"description\" colspan=\"1\">\n"+ -" <input type=\"hidden\" name=\"tokencount\" value=\""+Integer.toString(k)+"\"/>\n"+ -" <input type=\"hidden\" name=\"accessop\" value=\"\"/>\n"+ -" <a name=\""+"token_"+Integer.toString(k)+"\">\n"+ -" <input type=\"button\" value=\"Add\" alt=\"" + Messages.getAttributeString(locale,"SharedDriveConnector.AddToken") + "\" onClick='Javascript:SpecAddToken(\"token_"+Integer.toString(k+1)+"\")'/>\n"+ +" <input type=\"hidden\" name=\""+seqPrefix+"tokencount\" value=\""+Integer.toString(k)+"\"/>\n"+ +" <input type=\"hidden\" name=\""+seqPrefix+"accessop\" value=\"\"/>\n"+ +" <a name=\""+seqPrefix+"token_"+Integer.toString(k)+"\">\n"+ +" <input type=\"button\" value=\"Add\" alt=\"" + Messages.getAttributeString(locale,"SharedDriveConnector.AddToken") + "\" onClick='Javascript:"+seqPrefix+"SpecAddToken(\""+seqPrefix+"token_"+Integer.toString(k+1)+"\")'/>\n"+ " </a>\n"+ " </td>\n"+ " <td class=\"value\" colspan=\"3\">\n"+ -" <nobr><input type=\"text\" size=\"30\" name=\"spectoken\" value=\"\"/></nobr>\n"+ +" <nobr><input type=\"text\" size=\"30\" name=\""+seqPrefix+"spectoken\" value=\"\"/></nobr>\n"+ " </td>\n"+ " </tr>\n"+ "\n"+ @@ -3497,8 +3501,8 @@ public class SharedDriveConnector extend " <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"SharedDriveConnector.ShareSecurity") + "</nobr></td>\n"+ " <td colspan=\"3\" class=\"value\">\n"+ " <nobr>\n"+ -" <input type=\"radio\" name=\"specsharesecurity\" value=\"on\" "+(shareSecurityOn?"checked=\"true\"":"")+" />" + Messages.getBodyString(locale,"SharedDriveConnector.Enabled") + " \n"+ -" <input type=\"radio\" name=\"specsharesecurity\" value=\"off\" "+((shareSecurityOn==false)?"checked=\"true\"":"")+" />" + Messages.getBodyString(locale,"SharedDriveConnector.Disabled") + "\n"+ +" <input type=\"radio\" name=\""+seqPrefix+"specsharesecurity\" value=\"on\" "+(shareSecurityOn?"checked=\"true\"":"")+" />" + Messages.getBodyString(locale,"SharedDriveConnector.Enabled") + " \n"+ +" <input type=\"radio\" name=\""+seqPrefix+"specsharesecurity\" value=\"off\" "+((shareSecurityOn==false)?"checked=\"true\"":"")+" />" + Messages.getBodyString(locale,"SharedDriveConnector.Disabled") + "\n"+ " </nobr>\n"+ " </td>\n"+ " </tr>\n"+ @@ -3509,8 +3513,8 @@ public class SharedDriveConnector extend " <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"SharedDriveConnector.ParentFolderSecurity") + "</nobr></td>\n"+ " <td colspan=\"3\" class=\"value\">\n"+ " <nobr>\n"+ -" <input type=\"radio\" name=\"specparentfoldersecurity\" value=\"on\" "+(parentFolderSecurityOn?"checked=\"true\"":"")+" />" + Messages.getBodyString(locale,"SharedDriveConnector.Enabled") + " \n"+ -" <input type=\"radio\" name=\"specparentfoldersecurity\" value=\"off\" "+((parentFolderSecurityOn==false)?"checked=\"true\"":"")+" />" + Messages.getBodyString(locale,"SharedDriveConnector.Disabled") + "\n"+ +" <input type=\"radio\" name=\""+seqPrefix+"specparentfoldersecurity\" value=\"on\" "+(parentFolderSecurityOn?"checked=\"true\"":"")+" />" + Messages.getBodyString(locale,"SharedDriveConnector.Enabled") + " \n"+ +" <input type=\"radio\" name=\""+seqPrefix+"specparentfoldersecurity\" value=\"off\" "+((parentFolderSecurityOn==false)?"checked=\"true\"":"")+" />" + Messages.getBodyString(locale,"SharedDriveConnector.Disabled") + "\n"+ " </nobr>\n"+ " </td>\n"+ " </tr>\n"+ @@ -3521,7 +3525,7 @@ public class SharedDriveConnector extend else { out.print( -"<input type=\"hidden\" name=\"specsecurity\" value=\""+(securityOn?"on":"off")+"\"/>\n" +"<input type=\"hidden\" name=\""+seqPrefix+"specsecurity\" value=\""+(securityOn?"on":"off")+"\"/>\n" ); // Finally, go through forced ACL i = 0; @@ -3534,16 +3538,16 @@ public class SharedDriveConnector extend String accessDescription = "_"+Integer.toString(k); String token = sn.getAttributeValue(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_TOKEN); out.print( -"<input type=\"hidden\" name=\""+"spectoken"+accessDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(token)+"\"/>\n" +"<input type=\"hidden\" name=\""+seqPrefix+"spectoken"+accessDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(token)+"\"/>\n" ); k++; } } out.print( -"<input type=\"hidden\" name=\"tokencount\" value=\""+Integer.toString(k)+"\"/>\n"+ -"<input type=\"hidden\" name=\"specsharesecurity\" value=\""+(shareSecurityOn?"on":"off")+"\"/>\n"+ -"<input type=\"hidden\" name=\"specparentfoldersecurity\" value=\""+(parentFolderSecurityOn?"on":"off")+"\"/>\n" - ); +"<input type=\"hidden\" name=\""+seqPrefix+"tokencount\" value=\""+Integer.toString(k)+"\"/>\n"+ +"<input type=\"hidden\" name=\""+seqPrefix+"specsharesecurity\" value=\""+(shareSecurityOn?"on":"off")+"\"/>\n"+ +"<input type=\"hidden\" name=\""+seqPrefix+"specparentfoldersecurity\" value=\""+(parentFolderSecurityOn?"on":"off")+"\"/>\n" + ); } @@ -3570,18 +3574,18 @@ public class SharedDriveConnector extend } } - if (tabName.equals(Messages.getString(locale,"SharedDriveConnector.Metadata"))) + if (tabName.equals(Messages.getString(locale,"SharedDriveConnector.Metadata")) && connectionSequenceNumber == actualSequenceNumber) { out.print( -"<input type=\"hidden\" name=\"specmappingcount\" value=\""+Integer.toString(matchMap.getMatchCount())+"\"/>\n"+ -"<input type=\"hidden\" name=\"specmappingop\" value=\"\"/>\n"+ +"<input type=\"hidden\" name=\""+seqPrefix+"specmappingcount\" value=\""+Integer.toString(matchMap.getMatchCount())+"\"/>\n"+ +"<input type=\"hidden\" name=\""+seqPrefix+"specmappingop\" value=\"\"/>\n"+ "<table class=\"displaytable\">\n"+ " <tr><td class=\"separator\" colspan=\"4\"><hr/></td></tr>\n"+ "\n"+ " <tr>\n"+ " <td class=\"description\" colspan=\"1\"><nobr>" + Messages.getBodyString(locale,"SharedDriveConnector.PathAttributeName") + "</nobr></td>\n"+ " <td class=\"value\" colspan=\"3\">\n"+ -" <input type=\"text\" name=\"specpathnameattribute\" size=\"20\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(pathNameAttribute)+"\"/>\n"+ +" <input type=\"text\" name=\""+seqPrefix+"specpathnameattribute\" size=\"20\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(pathNameAttribute)+"\"/>\n"+ " </td>\n"+ " </tr>\n"+ "\n"+ @@ -3596,14 +3600,14 @@ public class SharedDriveConnector extend out.print( " <tr>\n"+ " <td class=\"value\">\n"+ -" <input type=\"hidden\" name=\""+"specmappingop_"+Integer.toString(i)+"\" value=\"\"/>\n"+ -" <a name=\""+"mapping_"+Integer.toString(i)+"\">\n"+ -" <input type=\"button\" onClick='Javascript:SpecOp(\"specmappingop_"+Integer.toString(i)+"\",\"Delete\",\"mapping_"+Integer.toString(i)+"\")' alt=\""+Messages.getAttributeString(locale,"SharedDriveConnector.DeleteMapping")+Integer.toString(i)+"\" value=\"Delete\"/>\n"+ +" <input type=\"hidden\" name=\""+seqPrefix+"specmappingop_"+Integer.toString(i)+"\" value=\"\"/>\n"+ +" <a name=\""+seqPrefix+"mapping_"+Integer.toString(i)+"\">\n"+ +" <input type=\"button\" onClick='Javascript:"+seqPrefix+"SpecOp(\""+seqPrefix+"specmappingop_"+Integer.toString(i)+"\",\"Delete\",\""+seqPrefix+"mapping_"+Integer.toString(i)+"\")' alt=\""+Messages.getAttributeString(locale,"SharedDriveConnector.DeleteMapping")+Integer.toString(i)+"\" value=\"Delete\"/>\n"+ " </a>\n"+ " </td>\n"+ -" <td class=\"value\"><input type=\"hidden\" name=\""+"specmatch_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(matchString)+"\"/>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(matchString)+"</td>\n"+ +" <td class=\"value\"><input type=\"hidden\" name=\""+seqPrefix+"specmatch_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(matchString)+"\"/>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(matchString)+"</td>\n"+ " <td class=\"value\">==></td>\n"+ -" <td class=\"value\"><input type=\"hidden\" name=\""+"specreplace_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(replaceString)+"\"/>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(replaceString)+"</td>\n"+ +" <td class=\"value\"><input type=\"hidden\" name=\""+seqPrefix+"specreplace_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(replaceString)+"\"/>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(replaceString)+"</td>\n"+ " </tr>\n" ); i++; @@ -3619,13 +3623,13 @@ public class SharedDriveConnector extend "\n"+ " <tr>\n"+ " <td class=\"value\">\n"+ -" <a name=\""+"mapping_"+Integer.toString(i)+"\">\n"+ -" <input type=\"button\" onClick='Javascript:SpecAddMapping(\"mapping_"+Integer.toString(i+1)+"\")' alt=\"" + Messages.getAttributeString(locale,"SharedDriveConnector.AddToMappings") + "\" value=\"Add\"/>\n"+ +" <a name=\""+seqPrefix+"mapping_"+Integer.toString(i)+"\">\n"+ +" <input type=\"button\" onClick='Javascript:"+seqPrefix+"SpecAddMapping(\""+seqPrefix+"mapping_"+Integer.toString(i+1)+"\")' alt=\"" + Messages.getAttributeString(locale,"SharedDriveConnector.AddToMappings") + "\" value=\"Add\"/>\n"+ " </a>\n"+ " </td>\n"+ -" <td class=\"value\">" + Messages.getBodyString(locale,"SharedDriveConnector.MatchRegexp") + "<input type=\"text\" name=\"specmatch\" size=\"32\" value=\"\"/></td>\n"+ +" <td class=\"value\">" + Messages.getBodyString(locale,"SharedDriveConnector.MatchRegexp") + "<input type=\"text\" name=\""+seqPrefix+"specmatch\" size=\"32\" value=\"\"/></td>\n"+ " <td class=\"value\">==></td>\n"+ -" <td class=\"value\">" + Messages.getBodyString(locale,"SharedDriveConnector.ReplaceString") + "<input type=\"text\" name=\"specreplace\" size=\"32\" value=\"\"/></td>\n"+ +" <td class=\"value\">" + Messages.getBodyString(locale,"SharedDriveConnector.ReplaceString") + "<input type=\"text\" name=\""+seqPrefix+"specreplace\" size=\"32\" value=\"\"/></td>\n"+ " </tr>\n"+ "</table>\n" ); @@ -3633,8 +3637,8 @@ public class SharedDriveConnector extend else { out.print( -"<input type=\"hidden\" name=\"specpathnameattribute\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(pathNameAttribute)+"\"/>\n"+ -"<input type=\"hidden\" name=\"specmappingcount\" value=\""+Integer.toString(matchMap.getMatchCount())+"\"/>\n" +"<input type=\"hidden\" name=\""+seqPrefix+"specpathnameattribute\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(pathNameAttribute)+"\"/>\n"+ +"<input type=\"hidden\" name=\""+seqPrefix+"specmappingcount\" value=\""+Integer.toString(matchMap.getMatchCount())+"\"/>\n" ); i = 0; while (i < matchMap.getMatchCount()) @@ -3642,8 +3646,8 @@ public class SharedDriveConnector extend String matchString = matchMap.getMatchString(i); String replaceString = matchMap.getReplaceString(i); out.print( -"<input type=\"hidden\" name=\""+"specmatch_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(matchString)+"\"/>\n"+ -"<input type=\"hidden\" name=\""+"specreplace_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(replaceString)+"\"/>\n" +"<input type=\"hidden\" name=\""+seqPrefix+"specmatch_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(matchString)+"\"/>\n"+ +"<input type=\"hidden\" name=\""+seqPrefix+"specreplace_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(replaceString)+"\"/>\n" ); i++; } @@ -3673,11 +3677,11 @@ public class SharedDriveConnector extend } } - if (tabName.equals(Messages.getString(locale,"SharedDriveConnector.FileMapping"))) + if (tabName.equals(Messages.getString(locale,"SharedDriveConnector.FileMapping")) && connectionSequenceNumber == actualSequenceNumber) { out.print( -"<input type=\"hidden\" name=\"specfmapcount\" value=\""+Integer.toString(fileMap.getMatchCount())+"\"/>\n"+ -"<input type=\"hidden\" name=\"specfmapop\" value=\"\"/>\n"+ +"<input type=\"hidden\" name=\""+seqPrefix+"specfmapcount\" value=\""+Integer.toString(fileMap.getMatchCount())+"\"/>\n"+ +"<input type=\"hidden\" name=\""+seqPrefix+"specfmapop\" value=\"\"/>\n"+ "<table class=\"displaytable\">\n"+ " <tr><td class=\"separator\" colspan=\"4\"><hr/></td></tr>\n" ); @@ -3689,14 +3693,14 @@ public class SharedDriveConnector extend out.print( " <tr>\n"+ " <td class=\"value\">\n"+ -" <input type=\"hidden\" name=\""+"specfmapop_"+Integer.toString(i)+"\" value=\"\"/>\n"+ -" <a name=\""+"fmap_"+Integer.toString(i)+"\">\n"+ -" <input type=\"button\" onClick='Javascript:SpecOp(\"specfmapop_"+Integer.toString(i)+"\",\"Delete\",\"fmap_"+Integer.toString(i)+"\")' alt=\""+Messages.getAttributeString(locale,"SharedDriveConnector.DeleteFileMapping")+Integer.toString(i)+"\" value=\"Delete\"/>\n"+ +" <input type=\"hidden\" name=\""+seqPrefix+"specfmapop_"+Integer.toString(i)+"\" value=\"\"/>\n"+ +" <a name=\""+seqPrefix+"fmap_"+Integer.toString(i)+"\">\n"+ +" <input type=\"button\" onClick='Javascript:"+seqPrefix+"SpecOp(\""+seqPrefix+"specfmapop_"+Integer.toString(i)+"\",\"Delete\",\""+seqPrefix+"fmap_"+Integer.toString(i)+"\")' alt=\""+Messages.getAttributeString(locale,"SharedDriveConnector.DeleteFileMapping")+Integer.toString(i)+"\" value=\"Delete\"/>\n"+ " </a>\n"+ " </td>\n"+ -" <td class=\"value\"><input type=\"hidden\" name=\""+"specfmapmatch_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(matchString)+"\"/>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(matchString)+"</td>\n"+ +" <td class=\"value\"><input type=\"hidden\" name=\""+seqPrefix+"specfmapmatch_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(matchString)+"\"/>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(matchString)+"</td>\n"+ " <td class=\"value\">==></td>\n"+ -" <td class=\"value\"><input type=\"hidden\" name=\""+"specfmapreplace_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(replaceString)+"\"/>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(replaceString)+"</td>\n"+ +" <td class=\"value\"><input type=\"hidden\" name=\""+seqPrefix+"specfmapreplace_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(replaceString)+"\"/>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(replaceString)+"</td>\n"+ " </tr>\n" ); i++; @@ -3712,13 +3716,13 @@ public class SharedDriveConnector extend "\n"+ " <tr>\n"+ " <td class=\"value\">\n"+ -" <a name=\""+"fmap_"+Integer.toString(i)+"\">\n"+ -" <input type=\"button\" onClick='Javascript:SpecAddFMap(\"fmap_"+Integer.toString(i+1)+"\")' alt=\"" + Messages.getAttributeString(locale,"SharedDriveConnector.AddToFileMappings") + "\" value=\"Add\"/>\n"+ +" <a name=\""+seqPrefix+"fmap_"+Integer.toString(i)+"\">\n"+ +" <input type=\"button\" onClick='Javascript:"+seqPrefix+"SpecAddFMap(\""+seqPrefix+"fmap_"+Integer.toString(i+1)+"\")' alt=\"" + Messages.getAttributeString(locale,"SharedDriveConnector.AddToFileMappings") + "\" value=\"Add\"/>\n"+ " </a>\n"+ " </td>\n"+ -" <td class=\"value\">" + Messages.getBodyString(locale,"SharedDriveConnector.MatchRegexp") + "<input type=\"text\" name=\"specfmapmatch\" size=\"32\" value=\"\"/></td>\n"+ +" <td class=\"value\">" + Messages.getBodyString(locale,"SharedDriveConnector.MatchRegexp") + "<input type=\"text\" name=\""+seqPrefix+"specfmapmatch\" size=\"32\" value=\"\"/></td>\n"+ " <td class=\"value\">==></td>\n"+ -" <td class=\"value\">" + Messages.getBodyString(locale,"SharedDriveConnector.ReplaceString") + "<input type=\"text\" name=\"specfmapreplace\" size=\"32\" value=\"\"/></td>\n"+ +" <td class=\"value\">" + Messages.getBodyString(locale,"SharedDriveConnector.ReplaceString") + "<input type=\"text\" name=\""+seqPrefix+"specfmapreplace\" size=\"32\" value=\"\"/></td>\n"+ " </tr>\n"+ "</table>\n" ); @@ -3726,7 +3730,7 @@ public class SharedDriveConnector extend else { out.print( -"<input type=\"hidden\" name=\"specfmapcount\" value=\""+Integer.toString(fileMap.getMatchCount())+"\"/>\n" +"<input type=\"hidden\" name=\""+seqPrefix+"specfmapcount\" value=\""+Integer.toString(fileMap.getMatchCount())+"\"/>\n" ); i = 0; while (i < fileMap.getMatchCount()) @@ -3734,18 +3738,18 @@ public class SharedDriveConnector extend String matchString = fileMap.getMatchString(i); String replaceString = fileMap.getReplaceString(i); out.print( -"<input type=\"hidden\" name=\""+"specfmapmatch_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(matchString)+"\"/>\n"+ -"<input type=\"hidden\" name=\""+"specfmapreplace_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(replaceString)+"\"/>\n" +"<input type=\"hidden\" name=\""+seqPrefix+"specfmapmatch_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(matchString)+"\"/>\n"+ +"<input type=\"hidden\" name=\""+seqPrefix+"specfmapreplace_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(replaceString)+"\"/>\n" ); i++; } } - if (tabName.equals(Messages.getString(locale,"SharedDriveConnector.URLMapping"))) + if (tabName.equals(Messages.getString(locale,"SharedDriveConnector.URLMapping")) && connectionSequenceNumber == actualSequenceNumber) { out.print( -"<input type=\"hidden\" name=\"specumapcount\" value=\""+Integer.toString(uriMap.getMatchCount())+"\"/>\n"+ -"<input type=\"hidden\" name=\"specumapop\" value=\"\"/>\n"+ +"<input type=\"hidden\" name=\""+seqPrefix+"specumapcount\" value=\""+Integer.toString(uriMap.getMatchCount())+"\"/>\n"+ +"<input type=\"hidden\" name=\""+seqPrefix+"specumapop\" value=\"\"/>\n"+ "<table class=\"displaytable\">\n"+ " <tr><td class=\"separator\" colspan=\"4\"><hr/></td></tr>\n" ); @@ -3757,18 +3761,18 @@ public class SharedDriveConnector extend out.print( " <tr>\n"+ " <td class=\"value\">\n"+ -" <input type=\"hidden\" name=\""+"specumapop_"+Integer.toString(i)+"\" value=\"\"/>\n"+ -" <a name=\""+"umap_"+Integer.toString(i)+"\">\n"+ -" <input type=\"button\" onClick='Javascript:SpecOp(\"specumapop_"+Integer.toString(i)+"\",\"Delete\",\"umap_"+Integer.toString(i)+"\")' alt=\""+Messages.getAttributeString(locale,"SharedDriveConnector.DeleteUrlMapping")+Integer.toString(i)+"\" value=\"Delete\"/>\n"+ +" <input type=\"hidden\" name=\""+seqPrefix+"specumapop_"+Integer.toString(i)+"\" value=\"\"/>\n"+ +" <a name=\""+seqPrefix+"umap_"+Integer.toString(i)+"\">\n"+ +" <input type=\"button\" onClick='Javascript:"+seqPrefix+"SpecOp(\""+seqPrefix+"specumapop_"+Integer.toString(i)+"\",\"Delete\",\""+seqPrefix+"umap_"+Integer.toString(i)+"\")' alt=\""+Messages.getAttributeString(locale,"SharedDriveConnector.DeleteUrlMapping")+Integer.toString(i)+"\" value=\"Delete\"/>\n"+ " </a>\n"+ " </td>\n"+ " <td class=\"value\">\n"+ -" <input type=\"hidden\" name=\""+"specumapmatch_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(matchString)+"\"/>\n"+ +" <input type=\"hidden\" name=\""+seqPrefix+"specumapmatch_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(matchString)+"\"/>\n"+ " "+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(matchString)+"\n"+ " </td>\n"+ " <td class=\"value\">==></td>\n"+ " <td class=\"value\">\n"+ -" <input type=\"hidden\" name=\""+"specumapreplace_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(replaceString)+"\"/>\n"+ +" <input type=\"hidden\" name=\""+seqPrefix+"specumapreplace_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(replaceString)+"\"/>\n"+ " "+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(replaceString)+"\n"+ " </td>\n"+ " </tr>\n" @@ -3786,13 +3790,13 @@ public class SharedDriveConnector extend " \n"+ " <tr>\n"+ " <td class=\"value\">\n"+ -" <a name=\""+"umap_"+Integer.toString(i)+"\">\n"+ -" <input type=\"button\" onClick='Javascript:SpecAddUMap(\"umap_"+Integer.toString(i+1)+"\")' alt=\"" + Messages.getAttributeString(locale,"SharedDriveConnector.AddToURLMappings") + "\" value=\"Add\"/>\n"+ +" <a name=\""+seqPrefix+"umap_"+Integer.toString(i)+"\">\n"+ +" <input type=\"button\" onClick='Javascript:"+seqPrefix+"SpecAddUMap(\""+seqPrefix+"umap_"+Integer.toString(i+1)+"\")' alt=\"" + Messages.getAttributeString(locale,"SharedDriveConnector.AddToURLMappings") + "\" value=\"Add\"/>\n"+ " </a>\n"+ " </td>\n"+ -" <td class=\"value\">" + Messages.getBodyString(locale,"SharedDriveConnector.MatchRegexp") + "<input type=\"text\" name=\"specumapmatch\" size=\"32\" value=\"\"/></td>\n"+ +" <td class=\"value\">" + Messages.getBodyString(locale,"SharedDriveConnector.MatchRegexp") + "<input type=\"text\" name=\""+seqPrefix+"specumapmatch\" size=\"32\" value=\"\"/></td>\n"+ " <td class=\"value\">==></td>\n"+ -" <td class=\"value\">" + Messages.getBodyString(locale,"SharedDriveConnector.ReplaceString") + "<input type=\"text\" name=\"specumapreplace\" size=\"32\" value=\"\"/></td>\n"+ +" <td class=\"value\">" + Messages.getBodyString(locale,"SharedDriveConnector.ReplaceString") + "<input type=\"text\" name=\""+seqPrefix+"specumapreplace\" size=\"32\" value=\"\"/></td>\n"+ " </tr>\n"+ "</table>\n" ); @@ -3800,7 +3804,7 @@ public class SharedDriveConnector extend else { out.print( -"<input type=\"hidden\" name=\"specumapcount\" value=\""+Integer.toString(uriMap.getMatchCount())+"\"/>\n" +"<input type=\"hidden\" name=\""+seqPrefix+"specumapcount\" value=\""+Integer.toString(uriMap.getMatchCount())+"\"/>\n" ); i = 0; while (i < uriMap.getMatchCount()) @@ -3808,8 +3812,8 @@ public class SharedDriveConnector extend String matchString = uriMap.getMatchString(i); String replaceString = uriMap.getReplaceString(i); out.print( -"<input type=\"hidden\" name=\""+"specumapmatch_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(matchString)+"\"/>\n"+ -"<input type=\"hidden\" name=\""+"specumapreplace_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(replaceString)+"\"/>\n" +"<input type=\"hidden\" name=\""+seqPrefix+"specumapmatch_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(matchString)+"\"/>\n"+ +"<input type=\"hidden\" name=\""+seqPrefix+"specumapreplace_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(replaceString)+"\"/>\n" ); i++; } @@ -3833,7 +3837,9 @@ public class SharedDriveConnector extend int connectionSequenceNumber) throws ManifoldCFException { - String x = variableContext.getParameter("pathcount"); + String seqPrefix = "s"+connectionSequenceNumber+"_"; + + String x = variableContext.getParameter(seqPrefix+"pathcount"); if (x != null) { // Delete all path specs first @@ -3854,7 +3860,7 @@ public class SharedDriveConnector extend while (i < pathCount) { String pathDescription = "_"+Integer.toString(i); - String pathOpName = "pathop"+pathDescription; + String pathOpName = seqPrefix+"pathop"+pathDescription; x = variableContext.getParameter(pathOpName); if (x != null && x.equals("Delete")) { @@ -3863,12 +3869,12 @@ public class SharedDriveConnector extend continue; } // Path inserts won't happen until the very end - String path = variableContext.getParameter("specpath"+pathDescription); + String path = variableContext.getParameter(seqPrefix+"specpath"+pathDescription); SpecificationNode node = new SpecificationNode(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.NODE_STARTPOINT); node.setAttribute(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_PATH,path); // Now, get the number of children - String y = variableContext.getParameter("specchildcount"+pathDescription); + String y = variableContext.getParameter(seqPrefix+"specchildcount"+pathDescription); int childCount = Integer.parseInt(y); int j = 0; int w = 0; @@ -3876,7 +3882,7 @@ public class SharedDriveConnector extend { String instanceDescription = "_"+Integer.toString(i)+"_"+Integer.toString(j); // Look for an insert or a delete at this point - String instanceOp = "specop"+instanceDescription; + String instanceOp = seqPrefix+"specop"+instanceDescription; String z = variableContext.getParameter(instanceOp); String flavor; String type; @@ -3892,10 +3898,10 @@ public class SharedDriveConnector extend if (z != null && z.equals("Insert Here")) { // Process the insertion as we gather. - flavor = variableContext.getParameter("specfl_i"+instanceDescription); + flavor = variableContext.getParameter(seqPrefix+"specfl_i"+instanceDescription); indexable = ""; type = ""; - String xxx = variableContext.getParameter("spectin_i"+instanceDescription); + String xxx = variableContext.getParameter(seqPrefix+"spectin_i"+instanceDescription); if (xxx.equals("file") || xxx.equals("directory")) type = xxx; else if (xxx.equals("indexable-file")) @@ -3909,7 +3915,7 @@ public class SharedDriveConnector extend type = "file"; } - match = variableContext.getParameter("specfile_i"+instanceDescription); + match = variableContext.getParameter(seqPrefix+"specfile_i"+instanceDescription); sn = new SpecificationNode(flavor); if (type != null && type.length() > 0) sn.setAttribute(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_TYPE,type); @@ -3918,10 +3924,10 @@ public class SharedDriveConnector extend sn.setAttribute(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_FILESPEC,match); node.addChild(w++,sn); } - flavor = variableContext.getParameter("specfl"+instanceDescription); - type = variableContext.getParameter("specty"+instanceDescription); - match = variableContext.getParameter("specfile"+instanceDescription); - indexable = variableContext.getParameter("specin"+instanceDescription); + flavor = variableContext.getParameter(seqPrefix+"specfl"+instanceDescription); + type = variableContext.getParameter(seqPrefix+"specty"+instanceDescription); + match = variableContext.getParameter(seqPrefix+"specfile"+instanceDescription); + indexable = variableContext.getParameter(seqPrefix+"specin"+instanceDescription); sn = new SpecificationNode(flavor); if (type != null && type.length() > 0) sn.setAttribute(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_TYPE,type); @@ -3934,10 +3940,10 @@ public class SharedDriveConnector extend if (x != null && x.equals("Add")) { // Process adds to the end of the rules in-line - String match = variableContext.getParameter("specfile"+pathDescription); + String match = variableContext.getParameter(seqPrefix+"specfile"+pathDescription); String indexable = ""; String type = ""; - String xxx = variableContext.getParameter("spectin"+pathDescription); + String xxx = variableContext.getParameter(seqPrefix+"spectin"+pathDescription); if (xxx.equals("file") || xxx.equals("directory")) type = xxx; else if (xxx.equals("indexable-file")) @@ -3951,7 +3957,7 @@ public class SharedDriveConnector extend type = "file"; } - String flavor = variableContext.getParameter("specfl"+pathDescription); + String flavor = variableContext.getParameter(seqPrefix+"specfl"+pathDescription); SpecificationNode sn = new SpecificationNode(flavor); if (type != null && type.length() > 0) sn.setAttribute(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_TYPE,type); @@ -3966,10 +3972,10 @@ public class SharedDriveConnector extend } // See if there's a global add operation - String op = variableContext.getParameter("pathop"); + String op = variableContext.getParameter(seqPrefix+"pathop"); if (op != null && op.equals("Add")) { - String path = variableContext.getParameter("specpath"); + String path = variableContext.getParameter(seqPrefix+"specpath"); SpecificationNode node = new SpecificationNode(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.NODE_STARTPOINT); node.setAttribute(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_PATH,path); ds.addChild(ds.getChildCount(),node); @@ -3988,19 +3994,19 @@ public class SharedDriveConnector extend else if (op != null && op.equals("Up")) { // Strip off end - String path = variableContext.getParameter("specpath"); + String path = variableContext.getParameter(seqPrefix+"specpath"); int k = path.lastIndexOf("/"); if (k == -1) path = ""; else path = path.substring(0,k); - currentContext.save("specpath",path); + currentContext.save(seqPrefix+"specpath",path); } else if (op != null && op.equals("AddToPath")) { - String path = variableContext.getParameter("specpath"); - String addon = variableContext.getParameter("pathaddon"); - String typein = variableContext.getParameter("pathtypein"); + String path = variableContext.getParameter(seqPrefix+"specpath"); + String addon = variableContext.getParameter(seqPrefix+"pathaddon"); + String typein = variableContext.getParameter(seqPrefix+"pathtypein"); if (addon != null && addon.length() > 0) { if (path.length() == 0) @@ -4027,11 +4033,11 @@ public class SharedDriveConnector extend // Effectively, this just means we can't add a typein to the path right now. } } - currentContext.save("specpath",path); + currentContext.save(seqPrefix+"specpath",path); } } - x = variableContext.getParameter("specmaxlength"); + x = variableContext.getParameter(seqPrefix+"specmaxlength"); if (x != null) { // Delete max length entry @@ -4052,7 +4058,7 @@ public class SharedDriveConnector extend } } - x = variableContext.getParameter("specsecurity"); + x = variableContext.getParameter(seqPrefix+"specsecurity"); if (x != null) { // Delete all security entries first @@ -4072,7 +4078,7 @@ public class SharedDriveConnector extend } - x = variableContext.getParameter("tokencount"); + x = variableContext.getParameter(seqPrefix+"tokencount"); if (x != null) { // Delete all file specs first @@ -4091,7 +4097,7 @@ public class SharedDriveConnector extend while (i < accessCount) { String accessDescription = "_"+Integer.toString(i); - String accessOpName = "accessop"+accessDescription; + String accessOpName = seqPrefix+"accessop"+accessDescription; x = variableContext.getParameter(accessOpName); if (x != null && x.equals("Delete")) { @@ -4100,24 +4106,24 @@ public class SharedDriveConnector extend continue; } // Get the stuff we need - String accessSpec = variableContext.getParameter("spectoken"+accessDescription); + String accessSpec = variableContext.getParameter(seqPrefix+"spectoken"+accessDescription); SpecificationNode node = new SpecificationNode(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.NODE_ACCESS); node.setAttribute(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_TOKEN,accessSpec); ds.addChild(ds.getChildCount(),node); i++; } - String op = variableContext.getParameter("accessop"); + String op = variableContext.getParameter(seqPrefix+"accessop"); if (op != null && op.equals("Add")) { - String accessspec = variableContext.getParameter("spectoken"); + String accessspec = variableContext.getParameter(seqPrefix+"spectoken"); SpecificationNode node = new SpecificationNode(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.NODE_ACCESS); node.setAttribute(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_TOKEN,accessspec); ds.addChild(ds.getChildCount(),node); } } - x = variableContext.getParameter("specsharesecurity"); + x = variableContext.getParameter(seqPrefix+"specsharesecurity"); if (x != null) { // Delete all security entries first @@ -4137,7 +4143,7 @@ public class SharedDriveConnector extend } - x = variableContext.getParameter("specparentfoldersecurity"); + x = variableContext.getParameter(seqPrefix+"specparentfoldersecurity"); if (x != null) { // Delete all security entries first @@ -4157,7 +4163,7 @@ public class SharedDriveConnector extend } - String xc = variableContext.getParameter("specpathnameattribute"); + String xc = variableContext.getParameter(seqPrefix+"specpathnameattribute"); if (xc != null) { // Delete old one @@ -4178,7 +4184,7 @@ public class SharedDriveConnector extend } } - xc = variableContext.getParameter("specmappingcount"); + xc = variableContext.getParameter(seqPrefix+"specmappingcount"); if (xc != null) { // Delete old spec @@ -4200,7 +4206,7 @@ public class SharedDriveConnector extend while (i < mappingCount) { String pathDescription = "_"+Integer.toString(i); - String pathOpName = "specmappingop"+pathDescription; + String pathOpName = seqPrefix+"specmappingop"+pathDescription; xc = variableContext.getParameter(pathOpName); if (xc != null && xc.equals("Delete")) { @@ -4209,8 +4215,8 @@ public class SharedDriveConnector extend continue; } // Inserts won't happen until the very end - String match = variableContext.getParameter("specmatch"+pathDescription); - String replace = variableContext.getParameter("specreplace"+pathDescription); + String match = variableContext.getParameter(seqPrefix+"specmatch"+pathDescription); + String replace = variableContext.getParameter(seqPrefix+"specreplace"+pathDescription); SpecificationNode node = new SpecificationNode(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.NODE_PATHMAP); node.setAttribute(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_MATCH,match); node.setAttribute(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_REPLACE,replace); @@ -4219,11 +4225,11 @@ public class SharedDriveConnector extend } // Check for add - xc = variableContext.getParameter("specmappingop"); + xc = variableContext.getParameter(seqPrefix+"specmappingop"); if (xc != null && xc.equals("Add")) { - String match = variableContext.getParameter("specmatch"); - String replace = variableContext.getParameter("specreplace"); + String match = variableContext.getParameter(seqPrefix+"specmatch"); + String replace = variableContext.getParameter(seqPrefix+"specreplace"); SpecificationNode node = new SpecificationNode(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.NODE_PATHMAP); node.setAttribute(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_MATCH,match); node.setAttribute(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_REPLACE,replace); @@ -4231,7 +4237,7 @@ public class SharedDriveConnector extend } } - xc = variableContext.getParameter("specfmapcount"); + xc = variableContext.getParameter(seqPrefix+"specfmapcount"); if (xc != null) { // Delete old spec @@ -4253,7 +4259,7 @@ public class SharedDriveConnector extend while (i < mappingCount) { String pathDescription = "_"+Integer.toString(i); - String pathOpName = "specfmapop"+pathDescription; + String pathOpName = seqPrefix+"specfmapop"+pathDescription; xc = variableContext.getParameter(pathOpName); if (xc != null && xc.equals("Delete")) { @@ -4262,8 +4268,8 @@ public class SharedDriveConnector extend continue; } // Inserts won't happen until the very end - String match = variableContext.getParameter("specfmapmatch"+pathDescription); - String replace = variableContext.getParameter("specfmapreplace"+pathDescription); + String match = variableContext.getParameter(seqPrefix+"specfmapmatch"+pathDescription); + String replace = variableContext.getParameter(seqPrefix+"specfmapreplace"+pathDescription); SpecificationNode node = new SpecificationNode(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.NODE_FILEMAP); node.setAttribute(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_MATCH,match); node.setAttribute(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_REPLACE,replace); @@ -4272,11 +4278,11 @@ public class SharedDriveConnector extend } // Check for add - xc = variableContext.getParameter("specfmapop"); + xc = variableContext.getParameter(seqPrefix+"specfmapop"); if (xc != null && xc.equals("Add")) { - String match = variableContext.getParameter("specfmapmatch"); - String replace = variableContext.getParameter("specfmapreplace"); + String match = variableContext.getParameter(seqPrefix+"specfmapmatch"); + String replace = variableContext.getParameter(seqPrefix+"specfmapreplace"); SpecificationNode node = new SpecificationNode(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.NODE_FILEMAP); node.setAttribute(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_MATCH,match); node.setAttribute(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_REPLACE,replace); @@ -4284,7 +4290,7 @@ public class SharedDriveConnector extend } } - xc = variableContext.getParameter("specumapcount"); + xc = variableContext.getParameter(seqPrefix+"specumapcount"); if (xc != null) { // Delete old spec @@ -4306,7 +4312,7 @@ public class SharedDriveConnector extend while (i < mappingCount) { String pathDescription = "_"+Integer.toString(i); - String pathOpName = "specumapop"+pathDescription; + String pathOpName = seqPrefix+"specumapop"+pathDescription; xc = variableContext.getParameter(pathOpName); if (xc != null && xc.equals("Delete")) { @@ -4315,8 +4321,8 @@ public class SharedDriveConnector extend continue; } // Inserts won't happen until the very end - String match = variableContext.getParameter("specumapmatch"+pathDescription); - String replace = variableContext.getParameter("specumapreplace"+pathDescription); + String match = variableContext.getParameter(seqPrefix+"specumapmatch"+pathDescription); + String replace = variableContext.getParameter(seqPrefix+"specumapreplace"+pathDescription); SpecificationNode node = new SpecificationNode(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.NODE_URIMAP); node.setAttribute(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_MATCH,match); node.setAttribute(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_REPLACE,replace); @@ -4325,11 +4331,11 @@ public class SharedDriveConnector extend } // Check for add - xc = variableContext.getParameter("specumapop"); + xc = variableContext.getParameter(seqPrefix+"specumapop"); if (xc != null && xc.equals("Add")) { - String match = variableContext.getParameter("specumapmatch"); - String replace = variableContext.getParameter("specumapreplace"); + String match = variableContext.getParameter(seqPrefix+"specumapmatch"); + String replace = variableContext.getParameter(seqPrefix+"specumapreplace"); SpecificationNode node = new SpecificationNode(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.NODE_URIMAP); node.setAttribute(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_MATCH,match); node.setAttribute(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector.ATTRIBUTE_REPLACE,replace);
