Modified: manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java?rev=1622740&r1=1622739&r2=1622740&view=diff ============================================================================== --- manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java (original) +++ manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java Fri Sep 5 16:48:06 2014 @@ -608,6 +608,7 @@ public class GoogleDriveRepositoryConnec throws ManifoldCFException, IOException { Map<String, Object> paramMap = new HashMap<String, Object>(); + paramMap.put("SeqNum", Integer.toString(connectionSequenceNumber)); // Fill in the map with data from all tabs fillInGOOGLEDRIVEQuerySpecificationMap(paramMap, ds); @@ -633,7 +634,9 @@ public class GoogleDriveRepositoryConnec int connectionSequenceNumber) throws ManifoldCFException { - String googleDriveQuery = variableContext.getParameter("googledrivequery"); + String seqPrefix = "s"+connectionSequenceNumber+"_"; + + String googleDriveQuery = variableContext.getParameter(seqPrefix+"googledrivequery"); if (googleDriveQuery != null) { int i = 0; while (i < ds.getChildCount()) { @@ -649,7 +652,7 @@ public class GoogleDriveRepositoryConnec ds.addChild(ds.getChildCount(), node); } - String xc = variableContext.getParameter("tokencount"); + String xc = variableContext.getParameter(seqPrefix+"tokencount"); if (xc != null) { // Delete all tokens first int i = 0; @@ -665,7 +668,7 @@ public class GoogleDriveRepositoryConnec i = 0; while (i < accessCount) { String accessDescription = "_"+Integer.toString(i); - String accessOpName = "accessop"+accessDescription; + String accessOpName = seqPrefix+"accessop"+accessDescription; xc = variableContext.getParameter(accessOpName); if (xc != null && xc.equals("Delete")) { // Next row @@ -673,17 +676,17 @@ public class GoogleDriveRepositoryConnec continue; } // Get the stuff we need - String accessSpec = variableContext.getParameter("spectoken"+accessDescription); + String accessSpec = variableContext.getParameter(seqPrefix+"spectoken"+accessDescription); SpecificationNode node = new SpecificationNode(JOB_ACCESS_NODE_TYPE); node.setAttribute(JOB_TOKEN_ATTRIBUTE,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(JOB_ACCESS_NODE_TYPE); node.setAttribute(JOB_TOKEN_ATTRIBUTE,accessspec); ds.addChild(ds.getChildCount(),node); @@ -715,6 +718,9 @@ public class GoogleDriveRepositoryConnec // Output GOOGLEDRIVEQuery tab Map<String, Object> paramMap = new HashMap<String, Object>(); paramMap.put("TabName", tabName); + paramMap.put("SeqNum", Integer.toString(connectionSequenceNumber)); + paramMap.put("SelectedNum", Integer.toString(actualSequenceNumber)); + fillInGOOGLEDRIVEQuerySpecificationMap(paramMap, ds); fillInGOOGLEDRIVESecuritySpecificationMap(paramMap, ds); Messages.outputResourceWithVelocity(out,locale,EDIT_SPEC_FORWARD_GOOGLEDRIVEQUERY,paramMap); @@ -741,6 +747,7 @@ public class GoogleDriveRepositoryConnec tabsArray.add(Messages.getString(locale, GOOGLEDRIVE_SECURITY_TAB_PROPERTY)); Map<String, Object> paramMap = new HashMap<String, Object>(); + paramMap.put("SeqNum", Integer.toString(connectionSequenceNumber)); // Fill in the specification header map, using data from all tabs. fillInGOOGLEDRIVEQuerySpecificationMap(paramMap, ds);
Modified: manifoldcf/trunk/connectors/googledrive/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/googledrive/editSpecification_googledrive.js URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/googledrive/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/googledrive/editSpecification_googledrive.js?rev=1622740&r1=1622739&r2=1622740&view=diff ============================================================================== --- manifoldcf/trunk/connectors/googledrive/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/googledrive/editSpecification_googledrive.js (original) +++ manifoldcf/trunk/connectors/googledrive/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/googledrive/editSpecification_googledrive.js Fri Sep 5 16:48:06 2014 @@ -17,37 +17,37 @@ <script type="text/javascript"> <!-- -function checkSpecificationForSave() +function s${SeqNum}_checkSpecificationForSave() { - if (editjob.googledrivequery.value == "") { + if (editjob.s${SeqNum}_googledrivequery.value == "") { alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('GoogleDriveRepositoryConnector.SeedQueryCannotBeNull'))"); - SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('GoogleDriveRepositoryConnector.GoogleDriveQuery'))"); - editjob.googledrivequery.focus(); + SelectSequencedTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('GoogleDriveRepositoryConnector.GoogleDriveQuery'))",${SeqNum}); + editjob.s${SeqNum}_googledrivequery.focus(); return false; } return true; } -function SpecOp(n, opValue, anchorvalue) +function s${SeqNum}_SpecOp(n, opValue, anchorvalue) { eval("editjob."+n+".value = \""+opValue+"\""); postFormSetAnchor(anchorvalue); } -function SpecDeleteToken(i) +function s${SeqNum}_SpecDeleteToken(i) { - SpecOp("accessop_"+i,"Delete","token_"+i); + s${SeqNum}_SpecOp("s${SeqNum}_accessop_"+i,"Delete","s${SeqNum}_token_"+i); } -function SpecAddToken(i) +function s${SeqNum}_SpecAddToken(i) { - if (editjob.spectoken.value == "") + if (editjob.s${SeqNum}_spectoken.value == "") { alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('GoogleDriveRepositoryConnector.TypeInAnAccessToken'))"); - editjob.spectoken.focus(); + editjob.s${SeqNum}_spectoken.focus(); return; } - SpecOp("accessop","Add","token_"+i); + s${SeqNum}_SpecOp("s${SeqNum}_accessop","Add","s${SeqNum}_token_"+i); } //--> Modified: manifoldcf/trunk/connectors/googledrive/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/googledrive/editSpecification_googledriveQuery.html URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/googledrive/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/googledrive/editSpecification_googledriveQuery.html?rev=1622740&r1=1622739&r2=1622740&view=diff ============================================================================== --- manifoldcf/trunk/connectors/googledrive/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/googledrive/editSpecification_googledriveQuery.html (original) +++ manifoldcf/trunk/connectors/googledrive/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/googledrive/editSpecification_googledriveQuery.html Fri Sep 5 16:48:06 2014 @@ -15,7 +15,7 @@ limitations under the License. --> -#if($TabName == $ResourceBundle.getString('GoogleDriveRepositoryConnector.GoogleDriveQuery')) +#if($TabName == $ResourceBundle.getString('GoogleDriveRepositoryConnector.GoogleDriveQuery') && ${SeqNum} == ${SelectedNum}) <table class="displaytable"> <tr><td class="separator" colspan="2"><hr/></td></tr> @@ -27,7 +27,7 @@ </td> <td class="value"> <nobr> - <input type="text" size="120" name="googledrivequery" value="$Encoder.attributeEscape($GOOGLEDRIVEQUERY)" /> + <input type="text" size="120" name="s${SeqNum}_googledrivequery" value="$Encoder.attributeEscape($GOOGLEDRIVEQUERY)" /> </nobr> </td> </tr> @@ -35,6 +35,6 @@ #else -<input type="hidden" name="googledrivequery" value="$Encoder.attributeEscape($GOOGLEDRIVEQUERY)" /> +<input type="hidden" name="s${SeqNum}_googledrivequery" value="$Encoder.attributeEscape($GOOGLEDRIVEQUERY)" /> #end Modified: manifoldcf/trunk/connectors/googledrive/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/googledrive/editSpecification_googledriveSecurity.html URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/googledrive/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/googledrive/editSpecification_googledriveSecurity.html?rev=1622740&r1=1622739&r2=1622740&view=diff ============================================================================== --- manifoldcf/trunk/connectors/googledrive/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/googledrive/editSpecification_googledriveSecurity.html (original) +++ manifoldcf/trunk/connectors/googledrive/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/googledrive/editSpecification_googledriveSecurity.html Fri Sep 5 16:48:06 2014 @@ -15,7 +15,7 @@ limitations under the License. --> -#if($TabName == $ResourceBundle.getString('GoogleDriveRepositoryConnector.Security')) +#if($TabName == $ResourceBundle.getString('GoogleDriveRepositoryConnector.Security') && ${SeqNum} == ${SelectedNum}) <table class="displaytable"> <tr><td class="separator" colspan="2"><hr/></td></tr> @@ -25,10 +25,10 @@ <tr> <td class="description"> - <input type="hidden" name="accessop_$atcounter" value=""/> - <input type="hidden" name="spectoken_$atcounter" value="$Encoder.attributeEscape($atoken.get('TOKEN'))"/> - <a name="token_$atcounter"> - <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('GoogleDriveRepositoryConnector.Delete'))" onClick='Javascript:SpecDeleteToken($atcounter)' alt="$Encoder.attributeEscape($ResourceBundle.getString('GoogleDriveRepositoryConnector.DeleteToken'))$atcounter"/> + <input type="hidden" name="s${SeqNum}_accessop_$atcounter" value=""/> + <input type="hidden" name="s${SeqNum}_spectoken_$atcounter" value="$Encoder.attributeEscape($atoken.get('TOKEN'))"/> + <a name="s${SeqNum}_token_$atcounter"> + <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('GoogleDriveRepositoryConnector.Delete'))" onClick='Javascript:s${SeqNum}_SpecDeleteToken($atcounter)' alt="$Encoder.attributeEscape($ResourceBundle.getString('GoogleDriveRepositoryConnector.DeleteToken'))$atcounter"/> </a> </td> <td class="value">$Encoder.bodyEscape($atoken.get('TOKEN'))</td> @@ -49,14 +49,14 @@ <tr> <td class="description"> - <input type="hidden" name="tokencount" value="$atcounter"/> - <input type="hidden" name="accessop" value=""/> - <a name="token_$atcounter"> - <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('GoogleDriveRepositoryConnector.Add'))" onClick='Javascript:SpecAddToken($nexttoken)' alt="$Encoder.attributeEscape($ResourceBundle.getString('GoogleDriveRepositoryConnector.AddAccessToken'))"/> + <input type="hidden" name="s${SeqNum}_tokencount" value="$atcounter"/> + <input type="hidden" name="s${SeqNum}_accessop" value=""/> + <a name="s${SeqNum}_token_$atcounter"> + <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('GoogleDriveRepositoryConnector.Add'))" onClick='Javascript:s${SeqNum}_SpecAddToken($nexttoken)' alt="$Encoder.attributeEscape($ResourceBundle.getString('GoogleDriveRepositoryConnector.AddAccessToken'))"/> </a> </td> <td class="value"> - <input type="text" size="30" name="spectoken" value=""/> + <input type="text" size="30" name="s${SeqNum}_spectoken" value=""/> </td> </tr> </table> @@ -65,9 +65,9 @@ #set($atcounter = 0) #foreach($atoken in $ACCESSTOKENS) -<input type="hidden" name="spectoken_$atcounter" value="$Encoder.attributeEscape($atoken.get('TOKEN'))"/> +<input type="hidden" name="s${SeqNum}_spectoken_$atcounter" value="$Encoder.attributeEscape($atoken.get('TOKEN'))"/> #set($atcounter = $atcounter + 1) #end -<input type="hidden" name="tokencount" value="$atcounter"/> +<input type="hidden" name="s${SeqNum}_tokencount" value="$atcounter"/> #end Modified: manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java?rev=1622740&r1=1622739&r2=1622740&view=diff ============================================================================== --- manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java (original) +++ manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java Fri Sep 5 16:48:06 2014 @@ -760,16 +760,13 @@ public class HDFSRepositoryConnector ext { tabsArray.add(Messages.getString(locale,"HDFSRepositoryConnector.Paths")); + String seqPrefix = "s"+connectionSequenceNumber+"_"; + out.print( "<script type=\"text/javascript\">\n"+ "<!--\n"+ -"function checkSpecification()\n"+ -"{\n"+ -" // Does nothing right now.\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"+ @@ -798,11 +795,13 @@ public class HDFSRepositoryConnector ext int connectionSequenceNumber, int actualSequenceNumber, String tabName) throws ManifoldCFException, IOException { + String seqPrefix = "s"+connectionSequenceNumber+"_"; + int i; int k; // Paths tab - if (tabName.equals(Messages.getString(locale,"HDFSRepositoryConnector.Paths"))) + if (tabName.equals(Messages.getString(locale,"HDFSRepositoryConnector.Paths")) && connectionSequenceNumber == actualSequenceNumber) { out.print( "<table class=\"displaytable\">\n"+ @@ -826,7 +825,7 @@ public class HDFSRepositoryConnector ext if (sn.getType().equals("startpoint")) { String pathDescription = "_"+Integer.toString(k); - String pathOpName = "specop"+pathDescription; + String pathOpName = seqPrefix+"specop"+pathDescription; String path = sn.getAttributeValue("path"); String convertToURIString = sn.getAttributeValue("converttouri"); @@ -839,9 +838,9 @@ public class HDFSRepositoryConnector ext " <tr class=\""+(((k % 2)==0)?"evenformrow":"oddformrow")+"\">\n"+ " <td class=\"formcolumncell\">\n"+ " <input type=\"hidden\" name=\""+pathOpName+"\" value=\"\"/>\n"+ -" <input type=\"hidden\" name=\""+"specpath"+pathDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(sn.getAttributeValue("path"))+"\"/>\n"+ -" <a name=\""+"path_"+Integer.toString(k)+"\">\n"+ -" <input type=\"button\" value=\"" + Messages.getAttributeString(locale,"HDFSRepositoryConnector.Delete") + "\" onClick='Javascript:SpecOp(\""+pathOpName+"\",\"Delete\",\"path_"+Integer.toString(k)+"\")' alt=\""+Messages.getAttributeString(locale,"HDFSRepositoryConnector.DeletePath")+Integer.toString(k)+"\"/>\n"+ +" <input type=\"hidden\" name=\""+seqPrefix+"specpath"+pathDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(sn.getAttributeValue("path"))+"\"/>\n"+ +" <a name=\""+seqPrefix+"path_"+Integer.toString(k)+"\">\n"+ +" <input type=\"button\" value=\"" + Messages.getAttributeString(locale,"HDFSRepositoryConnector.Delete") + "\" onClick='Javascript:"+seqPrefix+"SpecOp(\""+pathOpName+"\",\"Delete\",\""+seqPrefix+"path_"+Integer.toString(k)+"\")' alt=\""+Messages.getAttributeString(locale,"HDFSRepositoryConnector.DeletePath")+Integer.toString(k)+"\"/>\n"+ " </a>\n"+ " </td>\n"+ " <td class=\"formcolumncell\">\n"+ @@ -850,13 +849,13 @@ public class HDFSRepositoryConnector ext " </nobr>\n"+ " </td>\n"+ " <td class=\"formcolumncell\">\n"+ -" <input type=\"hidden\" name=\"converttouri"+pathDescription+"\" value=\""+(convertToURI?"true":"false")+"\">\n"+ +" <input type=\"hidden\" name=\""+seqPrefix+"converttouri"+pathDescription+"\" value=\""+(convertToURI?"true":"false")+"\">\n"+ " <nobr>\n"+ " "+(convertToURI?Messages.getBodyString(locale,"HDFSRepositoryConnector.Yes"):Messages.getBodyString(locale,"HDFSRepositoryConnector.No"))+" \n"+ " </nobr>\n"+ " </td>\n"+ " <td class=\"boxcell\">\n"+ -" <input type=\"hidden\" name=\""+"specchildcount"+pathDescription+"\" value=\""+Integer.toString(sn.getChildCount())+"\"/>\n"+ +" <input type=\"hidden\" name=\""+seqPrefix+"specchildcount"+pathDescription+"\" value=\""+Integer.toString(sn.getChildCount())+"\"/>\n"+ " <table class=\"formtable\">\n"+ " <tr class=\"formheaderrow\">\n"+ " <td class=\"formcolumnheader\"></td>\n"+ @@ -870,7 +869,7 @@ public class HDFSRepositoryConnector ext { 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("type"); @@ -879,12 +878,12 @@ public class HDFSRepositoryConnector ext " <tr class=\"evenformrow\">\n"+ " <td class=\"formcolumncell\">\n"+ " <nobr>\n"+ -" <input type=\"button\" value=\"" + Messages.getAttributeString(locale,"HDFSRepositoryConnector.InsertHere") + "\" onClick='Javascript:SpecOp(\"specop"+instanceDescription+"\",\"Insert Here\",\"match_"+Integer.toString(k)+"_"+Integer.toString(j+1)+"\")' alt=\""+Messages.getAttributeString(locale,"HDFSRepositoryConnector.InsertNewMatchForPath")+Integer.toString(k)+" before position #"+Integer.toString(j)+"\"/>\n"+ +" <input type=\"button\" value=\"" + Messages.getAttributeString(locale,"HDFSRepositoryConnector.InsertHere") + "\" onClick='Javascript:"+seqPrefix+"SpecOp(\""+seqPrefix+"specop"+instanceDescription+"\",\"Insert Here\",\""+seqPrefix+"match_"+Integer.toString(k)+"_"+Integer.toString(j+1)+"\")' alt=\""+Messages.getAttributeString(locale,"HDFSRepositoryConnector.InsertNewMatchForPath")+Integer.toString(k)+" before position #"+Integer.toString(j)+"\"/>\n"+ " </nobr>\n"+ " </td>\n"+ " <td class=\"formcolumncell\">\n"+ " <nobr>\n"+ -" <select name=\""+"specflavor"+instanceDescription+"\">\n"+ +" <select name=\""+seqPrefix+"specflavor"+instanceDescription+"\">\n"+ " <option value=\"include\">" + Messages.getBodyString(locale,"HDFSRepositoryConnector.include") + "</option>\n"+ " <option value=\"exclude\">" + Messages.getBodyString(locale,"HDFSRepositoryConnector.exclude") + "</option>\n"+ " </select>\n"+ @@ -892,7 +891,7 @@ public class HDFSRepositoryConnector ext " </td>\n"+ " <td class=\"formcolumncell\">\n"+ " <nobr>\n"+ -" <select name=\""+"spectype"+instanceDescription+"\">\n"+ +" <select name=\""+seqPrefix+"spectype"+instanceDescription+"\">\n"+ " <option value=\"file\">" + Messages.getBodyString(locale,"HDFSRepositoryConnector.File") + "</option>\n"+ " <option value=\"directory\">" + Messages.getBodyString(locale,"HDFSRepositoryConnector.Directory") + "</option>\n"+ " </select>\n"+ @@ -900,19 +899,19 @@ public class HDFSRepositoryConnector ext " </td>\n"+ " <td class=\"formcolumncell\">\n"+ " <nobr>\n"+ -" <input type=\"text\" size=\"10\" name=\""+"specmatch"+instanceDescription+"\" value=\"\"/>\n"+ +" <input type=\"text\" size=\"10\" name=\""+seqPrefix+"specmatch"+instanceDescription+"\" value=\"\"/>\n"+ " </nobr>\n"+ " </td>\n"+ " </tr>\n"+ " <tr class=\"oddformrow\">\n"+ " <td class=\"formcolumncell\">\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=\""+"specma"+instanceDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(nodeMatch)+"\"/>\n"+ -" <a name=\""+"match_"+Integer.toString(k)+"_"+Integer.toString(j)+"\">\n"+ -" <input type=\"button\" value=\"" + Messages.getAttributeString(locale,"HDFSRepositoryConnector.Delete") + "\" onClick='Javascript:SpecOp(\"specop"+instanceDescription+"\",\"Delete\",\"match_"+Integer.toString(k)+"_"+Integer.toString(j)+"\")' alt=\""+Messages.getAttributeString(locale,"HDFSRepositoryConnector.DeletePath")+Integer.toString(k)+", match spec #"+Integer.toString(j)+"\"/>\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+"specma"+instanceDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(nodeMatch)+"\"/>\n"+ +" <a name=\""+seqPrefix+"match_"+Integer.toString(k)+"_"+Integer.toString(j)+"\">\n"+ +" <input type=\"button\" value=\"" + Messages.getAttributeString(locale,"HDFSRepositoryConnector.Delete") + "\" onClick='Javascript:"+seqPrefix+"SpecOp(\""+instanceOpName+"\",\"Delete\",\""+seqPrefix+"match_"+Integer.toString(k)+"_"+Integer.toString(j)+"\")' alt=\""+Messages.getAttributeString(locale,"HDFSRepositoryConnector.DeletePath")+Integer.toString(k)+", match spec #"+Integer.toString(j)+"\"/>\n"+ " </a>\n"+ " </nobr>\n"+ " </td>\n"+ @@ -945,13 +944,13 @@ public class HDFSRepositoryConnector ext " <tr class=\"formrow\"><td class=\"lightseparator\" colspan=\"4\"><hr/></td></tr>\n"+ " <tr class=\"formrow\">\n"+ " <td class=\"formcolumncell\">\n"+ -" <a name=\""+"match_"+Integer.toString(k)+"_"+Integer.toString(j)+"\">\n"+ -" <input type=\"button\" value=\"" + Messages.getAttributeString(locale,"HDFSRepositoryConnector.Add") + "\" onClick='Javascript:SpecOp(\""+pathOpName+"\",\"Add\",\"match_"+Integer.toString(k)+"_"+Integer.toString(j+1)+"\")' alt=\""+Messages.getAttributeString(locale,"HDFSRepositoryConnector.AddNewMatchForPath")+Integer.toString(k)+"\"/>\n"+ +" <a name=\""+seqPrefix+"match_"+Integer.toString(k)+"_"+Integer.toString(j)+"\">\n"+ +" <input type=\"button\" value=\"" + Messages.getAttributeString(locale,"HDFSRepositoryConnector.Add") + "\" onClick='Javascript:"+seqPrefix+"SpecOp(\""+pathOpName+"\",\"Add\",\""+seqPrefix+"match_"+Integer.toString(k)+"_"+Integer.toString(j+1)+"\")' alt=\""+Messages.getAttributeString(locale,"HDFSRepositoryConnector.AddNewMatchForPath")+Integer.toString(k)+"\"/>\n"+ " </a>\n"+ " </td>\n"+ " <td class=\"formcolumncell\">\n"+ " <nobr>\n"+ -" <select name=\""+"specflavor"+pathDescription+"\">\n"+ +" <select name=\""+seqPrefix+"specflavor"+pathDescription+"\">\n"+ " <option value=\"include\">" + Messages.getBodyString(locale,"HDFSRepositoryConnector.include") + "</option>\n"+ " <option value=\"exclude\">" + Messages.getBodyString(locale,"HDFSRepositoryConnector.exclude") + "</option>\n"+ " </select>\n"+ @@ -959,7 +958,7 @@ public class HDFSRepositoryConnector ext " </td>\n"+ " <td class=\"formcolumncell\">\n"+ " <nobr>\n"+ -" <select name=\""+"spectype"+pathDescription+"\">\n"+ +" <select name=\""+seqPrefix+"spectype"+pathDescription+"\">\n"+ " <option value=\"file\">" + Messages.getBodyString(locale,"HDFSRepositoryConnector.File") + "</option>\n"+ " <option value=\"directory\">" + Messages.getBodyString(locale,"HDFSRepositoryConnector.Directory") + "</option>\n"+ " </select>\n"+ @@ -967,7 +966,7 @@ public class HDFSRepositoryConnector ext " </td>\n"+ " <td class=\"formcolumncell\">\n"+ " <nobr>\n"+ -" <input type=\"text\" size=\"10\" name=\""+"specmatch"+pathDescription+"\" value=\"\"/>\n"+ +" <input type=\"text\" size=\"10\" name=\""+seqPrefix+"specmatch"+pathDescription+"\" value=\"\"/>\n"+ " </nobr>\n"+ " </td>\n"+ " </tr>\n"+ @@ -989,21 +988,21 @@ public class HDFSRepositoryConnector ext " <tr class=\"formrow\">\n"+ " <td class=\"formcolumncell\">\n"+ " <nobr>\n"+ -" <a name=\""+"path_"+Integer.toString(k)+"\">\n"+ -" <input type=\"button\" value=\"" + Messages.getAttributeString(locale,"HDFSRepositoryConnector.Add") + "\" onClick='Javascript:SpecOp(\"specop\",\"Add\",\"path_"+Integer.toString(i+1)+"\")' alt=\"" + Messages.getAttributeString(locale,"HDFSRepositoryConnector.AddNewPath") + "\"/>\n"+ -" <input type=\"hidden\" name=\"pathcount\" value=\""+Integer.toString(k)+"\"/>\n"+ -" <input type=\"hidden\" name=\"specop\" value=\"\"/>\n"+ +" <a name=\""+seqPrefix+"path_"+Integer.toString(k)+"\">\n"+ +" <input type=\"button\" value=\"" + Messages.getAttributeString(locale,"HDFSRepositoryConnector.Add") + "\" onClick='Javascript:"+seqPrefix+"SpecOp(\""+seqPrefix+"specop\",\"Add\",\""+seqPrefix+"path_"+Integer.toString(i+1)+"\")' alt=\"" + Messages.getAttributeString(locale,"HDFSRepositoryConnector.AddNewPath") + "\"/>\n"+ +" <input type=\"hidden\" name=\""+seqPrefix+"pathcount\" value=\""+Integer.toString(k)+"\"/>\n"+ +" <input type=\"hidden\" name=\""+seqPrefix+"specop\" value=\"\"/>\n"+ " </a>\n"+ " </nobr>\n"+ " </td>\n"+ " <td class=\"formcolumncell\">\n"+ " <nobr>\n"+ -" <input type=\"text\" size=\"30\" name=\"specpath\" value=\"\"/>\n"+ +" <input type=\"text\" size=\"30\" name=\""+seqPrefix+"specpath\" value=\"\"/>\n"+ " </nobr>\n"+ " </td>\n"+ " <td class=\"formcolumncell\">\n"+ " <nobr>\n"+ -" <input name=\"converttouri\" type=\"checkbox\" value=\"true\"/>\n"+ +" <input name=\""+seqPrefix+"converttouri\" type=\"checkbox\" value=\"true\"/>\n"+ " </nobr>\n"+ " </td>\n"+ " <td class=\"formcolumncell\">\n"+ @@ -1034,9 +1033,9 @@ public class HDFSRepositoryConnector ext convertToURI = true; out.print( -"<input type=\"hidden\" name=\"specpath"+pathDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(path)+"\"/>\n"+ -"<input type=\"hidden\" name=\"converttouri"+pathDescription+"\" value=\""+(convertToURI?"true":"false")+"\">\n"+ -"<input type=\"hidden\" name=\"specchildcount"+pathDescription+"\" value=\""+Integer.toString(sn.getChildCount())+"\"/>\n" +"<input type=\"hidden\" name=\""+seqPrefix+"specpath"+pathDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(path)+"\"/>\n"+ +"<input type=\"hidden\" name=\""+seqPrefix+"converttouri"+pathDescription+"\" value=\""+(convertToURI?"true":"false")+"\">\n"+ +"<input type=\"hidden\" name=\""+seqPrefix+"specchildcount"+pathDescription+"\" value=\""+Integer.toString(sn.getChildCount())+"\"/>\n" ); int j = 0; @@ -1049,9 +1048,9 @@ public class HDFSRepositoryConnector ext String nodeType = excludeNode.getAttributeValue("type"); String nodeMatch = excludeNode.getAttributeValue("match"); out.print( -"<input type=\"hidden\" name=\"specfl"+instanceDescription+"\" value=\""+nodeFlavor+"\"/>\n"+ -"<input type=\"hidden\" name=\"specty"+instanceDescription+"\" value=\""+nodeType+"\"/>\n"+ -"<input type=\"hidden\" name=\"specma"+instanceDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(nodeMatch)+"\"/>\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+"specma"+instanceDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(nodeMatch)+"\"/>\n" ); j++; } @@ -1059,7 +1058,7 @@ public class HDFSRepositoryConnector ext } } out.print( -"<input type=\"hidden\" name=\"pathcount\" value=\""+Integer.toString(k)+"\"/>\n" +"<input type=\"hidden\" name=\""+seqPrefix+"pathcount\" value=\""+Integer.toString(k)+"\"/>\n" ); } } @@ -1081,7 +1080,9 @@ public class HDFSRepositoryConnector ext int connectionSequenceNumber) throws ManifoldCFException { - String x = variableContext.getParameter("pathcount"); + String seqPrefix = "s"+connectionSequenceNumber+"_"; + + String x = variableContext.getParameter(seqPrefix+"pathcount"); if (x != null) { ds.clearChildren(); @@ -1093,7 +1094,7 @@ public class HDFSRepositoryConnector ext while (i < pathCount) { String pathDescription = "_"+Integer.toString(i); - String pathOpName = "specop"+pathDescription; + String pathOpName = seqPrefix+"specop"+pathDescription; x = variableContext.getParameter(pathOpName); if (x != null && x.equals("Delete")) { @@ -1102,8 +1103,8 @@ public class HDFSRepositoryConnector ext continue; } // Path inserts won't happen until the very end - String path = variableContext.getParameter("specpath"+pathDescription); - String convertToURI = variableContext.getParameter("converttouri"+pathDescription); + String path = variableContext.getParameter(seqPrefix+"specpath"+pathDescription); + String convertToURI = variableContext.getParameter(seqPrefix+"converttouri"+pathDescription); SpecificationNode node = new SpecificationNode("startpoint"); node.setAttribute("path",path); @@ -1111,7 +1112,7 @@ public class HDFSRepositoryConnector ext node.setAttribute("converttouri",convertToURI); // 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; @@ -1119,7 +1120,7 @@ public class HDFSRepositoryConnector ext { 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; @@ -1134,17 +1135,17 @@ public class HDFSRepositoryConnector ext if (z != null && z.equals("Insert Here")) { // Process the insertion as we gather. - flavor = variableContext.getParameter("specflavor"+instanceDescription); - type = variableContext.getParameter("spectype"+instanceDescription); - match = variableContext.getParameter("specmatch"+instanceDescription); + flavor = variableContext.getParameter(seqPrefix+"specflavor"+instanceDescription); + type = variableContext.getParameter(seqPrefix+"spectype"+instanceDescription); + match = variableContext.getParameter(seqPrefix+"specmatch"+instanceDescription); sn = new SpecificationNode(flavor); sn.setAttribute("type",type); sn.setAttribute("match",match); node.addChild(w++,sn); } - flavor = variableContext.getParameter("specfl"+instanceDescription); - type = variableContext.getParameter("specty"+instanceDescription); - match = variableContext.getParameter("specma"+instanceDescription); + flavor = variableContext.getParameter(seqPrefix+"specfl"+instanceDescription); + type = variableContext.getParameter(seqPrefix+"specty"+instanceDescription); + match = variableContext.getParameter(seqPrefix+"specma"+instanceDescription); sn = new SpecificationNode(flavor); sn.setAttribute("type",type); sn.setAttribute("match",match); @@ -1154,9 +1155,9 @@ public class HDFSRepositoryConnector ext if (x != null && x.equals("Add")) { // Process adds to the end of the rules in-line - String match = variableContext.getParameter("specmatch"+pathDescription); - String type = variableContext.getParameter("spectype"+pathDescription); - String flavor = variableContext.getParameter("specflavor"+pathDescription); + String match = variableContext.getParameter(seqPrefix+"specmatch"+pathDescription); + String type = variableContext.getParameter(seqPrefix+"spectype"+pathDescription); + String flavor = variableContext.getParameter(seqPrefix+"specflavor"+pathDescription); SpecificationNode sn = new SpecificationNode(flavor); sn.setAttribute("type",type); sn.setAttribute("match",match); @@ -1167,11 +1168,11 @@ public class HDFSRepositoryConnector ext } // See if there's a global add operation - String op = variableContext.getParameter("specop"); + String op = variableContext.getParameter(seqPrefix+"specop"); if (op != null && op.equals("Add")) { - String path = variableContext.getParameter("specpath"); - String convertToURI = variableContext.getParameter("converttouri"); + String path = variableContext.getParameter(seqPrefix+"specpath"); + String convertToURI = variableContext.getParameter(seqPrefix+"converttouri"); SpecificationNode node = new SpecificationNode("startpoint"); node.setAttribute("path",path); @@ -1192,25 +1193,6 @@ public class HDFSRepositoryConnector ext } } - /* - * "filepathtouri" - */ - String filepathtouri = variableContext.getParameter("filepathtouri"); - if (filepathtouri != null) { - SpecificationNode sn; - int i = 0; - while (i < ds.getChildCount()) { - if (ds.getChild(i).getType().equals("filepathtouri")) { - ds.removeChild(i); - } else { - i++; - } - } - sn = new SpecificationNode("filepathtouri"); - sn.setValue(filepathtouri); - ds.addChild(ds.getChildCount(),sn); - } - return null; }
