svn commit: r1792828 - in /manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main: java/org/apache/manifoldcf/crawler/connectors/webcrawler/ resources/org/apache/manifoldcf/crawler/connectors/webcrawler/

Wed, 26 Apr 2017 16:40:15 -0700 

Author: kishore
Date: Wed Apr 26 23:39:59 2017
New Revision: 1792828

URL: http://svn.apache.org/viewvc?rev=1792828&view=rev
Log:
Resolved issues with converting

Modified:
    
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
    
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Canonicalization.html.vm
    
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Exclusions.html.vm
    
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Mappings.html.vm
    
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Metadata.html.vm
    
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Security.html.vm

Modified: 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java?rev=1792828&r1=1792827&r2=1792828&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
 Wed Apr 26 23:39:59 2017
@@ -2383,7 +2383,7 @@ public class WebcrawlerConnector extends
           allowReorderOutput = Messages.getBodyString(locale, 
"WebcrawlerConnector.no");
         }
         else
-          allowReorderOutput = Messages.getBodyString(locale, 
"WebcrawlerConnector.yes");
+          allowReorderOutput = allowReorder;
         String allowJavaSessionRemoval = 
specNode.getAttributeValue(WebcrawlerConfig.ATTR_JAVASESSIONREMOVAL);
         String allowJavaSessionRemovalOutput;
         if (allowJavaSessionRemoval == null || 
allowJavaSessionRemoval.length() == 0)
@@ -2392,7 +2392,7 @@ public class WebcrawlerConnector extends
           allowJavaSessionRemovalOutput = Messages.getBodyString(locale, 
"WebcrawlerConnector.no");
         }
         else
-          allowJavaSessionRemovalOutput = Messages.getBodyString(locale, 
"WebcrawlerConnector.yes");
+          allowJavaSessionRemovalOutput = allowJavaSessionRemoval;
         String allowASPSessionRemoval = 
specNode.getAttributeValue(WebcrawlerConfig.ATTR_ASPSESSIONREMOVAL);
         String allowASPSessionRemovalOutput;
         if (allowASPSessionRemoval == null || allowASPSessionRemoval.length() 
== 0)
@@ -2401,7 +2401,7 @@ public class WebcrawlerConnector extends
           allowASPSessionRemovalOutput = Messages.getBodyString(locale, 
"WebcrawlerConnector.no");
         }
         else
-          allowASPSessionRemovalOutput = Messages.getBodyString(locale, 
"WebcrawlerConnector.yes");
+          allowASPSessionRemovalOutput = allowASPSessionRemoval;
         String allowPHPSessionRemoval = 
specNode.getAttributeValue(WebcrawlerConfig.ATTR_PHPSESSIONREMOVAL);
         String allowPHPSessionRemovalOutput;
         if (allowPHPSessionRemoval == null || allowPHPSessionRemoval.length() 
== 0)
@@ -2410,7 +2410,7 @@ public class WebcrawlerConnector extends
           allowPHPSessionRemovalOutput = Messages.getBodyString(locale, 
"WebcrawlerConnector.no");
         }
         else
-          allowPHPSessionRemovalOutput = Messages.getBodyString(locale, 
"WebcrawlerConnector.yes");
+          allowPHPSessionRemovalOutput = allowPHPSessionRemoval;
         String allowBVSessionRemoval = 
specNode.getAttributeValue(WebcrawlerConfig.ATTR_BVSESSIONREMOVAL);
         String allowBVSessionRemovalOutput;
         if (allowBVSessionRemoval == null || allowBVSessionRemoval.length() == 
0)
@@ -2419,7 +2419,7 @@ public class WebcrawlerConnector extends
           allowBVSessionRemovalOutput = Messages.getBodyString(locale, 
"WebcrawlerConnector.no");
         }
         else
-          allowBVSessionRemovalOutput = Messages.getBodyString(locale, 
"WebcrawlerConnector.yes");
+          allowBVSessionRemovalOutput = allowBVSessionRemoval;
 
         canonicalizationMap.put("regexpString",regexpString);
         canonicalizationMap.put("description",description);
@@ -2525,7 +2525,7 @@ public class WebcrawlerConnector extends
     while (i < ds.getChildCount())
     {
       SpecificationNode sn = ds.getChild(i++);
-      if (sn.getType().equals(WebcrawlerConfig.NODE_INCLUDES))
+      if (sn.getType().equals(WebcrawlerConfig.NODE_EXCLUDES))
       {
         exclusions = sn.getValue();
         if (exclusions == null)
@@ -2572,10 +2572,10 @@ public class WebcrawlerConnector extends
 
   }
 
-  private void fillInMetadatasTab(Map<String,Object> velocityContext, 
IHTTPOutput out, Specification ds)
+  private void fillInMetadataTab(Map<String,Object> velocityContext, 
IHTTPOutput out, Specification ds)
   {
 
-    Set<String> excludedHeaders = new HashSet<String>();
+    Set<String> excludedHeaders = new HashSet<>();
 
     // Now, loop through description
     int i = 0;
@@ -2625,7 +2625,7 @@ public class WebcrawlerConnector extends
     fillInInclusionsTab(velocityContext,out,ds);
     fillInExclusionsTab(velocityContext,out,ds);
     fillInSecurityTab(velocityContext,out,ds);
-    fillInMetadatasTab(velocityContext,out,ds);
+    fillInMetadataTab(velocityContext,out,ds);
 
     // Seeds tab
     
Messages.outputResourceWithVelocity(out,locale,"editSpecification_Seeds.html.vm",velocityContext);

Modified: 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Canonicalization.html.vm
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Canonicalization.html.vm?rev=1792828&r1=1792827&r2=1792828&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Canonicalization.html.vm
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Canonicalization.html.vm
 Wed Apr 26 23:39:59 2017
@@ -21,7 +21,7 @@
   <tr><td class="separator" colspan="2"><hr/></td></tr>
   <tr>
     <td class="boxcell" colspan="2">
-      <input type="hidden" name="${SEQPREFIX}urlregexpop}" value="Continue"/>
+      <input type="hidden" name="${SEQPREFIX}urlregexpop" value="Continue"/>
       <input type="hidden" name="${SEQPREFIX}urlregexpnumber" value=""/>
       <table class="formtable">
         <tr class="formheaderrow">
@@ -59,7 +59,8 @@
           <td 
class="formcolumncell">$canonicalizationMap["allowBVSessionRemovalOutput"]</td>
         </tr>
         #end
-        #set( $COUNTER = $CANONICALIZATIONMAPLIST.size())
+        #set( $COUNTER = $CANONICALIZATIONMAPLIST.size() )
+        #set( $NEXTCOUNTER = $COUNTER + 1 )
         #if($COUNTER == 0)
         <tr class="formrow"><td colspan="8" 
class="formcolumnmessage"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('NoCanonicalizationSpecified'))</nobr></td></tr>
         #end
@@ -67,7 +68,7 @@
         <tr class="formrow">
           <td class="formcolumncell">
             <a name="${SEQPREFIX}urlregexp_${COUNTER}">
-              <input type="button" 
value="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.Add'))"
 
alt="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.AddUrlRegexp'))"
 
onclick='javascript:${SEQPREFIX}URLRegexpAdd("${SEQPREFIX}urlregexp_${COUNTER}");'/>
+              <input type="button" 
value="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.Add'))"
 
alt="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.AddUrlRegexp'))"
 
onclick='javascript:${SEQPREFIX}URLRegexpAdd("${SEQPREFIX}urlregexp_${NEXTCOUNTER}");'/>
               <input type="hidden" name="${SEQPREFIX}urlregexpcount" 
value="$COUNTER"/>
             </a>
           </td>

Modified: 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Exclusions.html.vm
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Exclusions.html.vm?rev=1792828&r1=1792827&r2=1792828&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Exclusions.html.vm
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Exclusions.html.vm
 Wed Apr 26 23:39:59 2017
@@ -39,7 +39,7 @@
   </tr>
 </table>
 #else
-<input type="hidden" name="${SEQPREFIX}exclusions" 
value="$Encoder.attributeEscape($INCLUSIONS)"/>
-<input type="hidden" name="${SEQPREFIX}exclusionsindex" 
value="$Encoder.attributeEscape($INCLUSIONSINDEX)"/>
-<input type="hidden" name="${SEQPREFIX}exclusionscontentindex" 
value="$Encoder.attributeEscape($INCLUSIONSCONTENTINDEX)"/>
+<input type="hidden" name="${SEQPREFIX}exclusions" 
value="$Encoder.attributeEscape($EXCLUSIONS)"/>
+<input type="hidden" name="${SEQPREFIX}exclusionsindex" 
value="$Encoder.attributeEscape($EXCLUSIONSINDEX)"/>
+<input type="hidden" name="${SEQPREFIX}exclusionscontentindex" 
value="$Encoder.attributeEscape($EXCLUSIONSCONTENTINDEX)"/>
 #end

Modified: 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Mappings.html.vm
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Mappings.html.vm?rev=1792828&r1=1792827&r2=1792828&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Mappings.html.vm
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Mappings.html.vm
 Wed Apr 26 23:39:59 2017
@@ -19,7 +19,7 @@
 #if($TABNAME == $ResourceBundle.getString('WebcrawlerConnector.URLMappings') 
&& ${SEQNUM} == ${SELECTEDNUM})
 <input type="hidden" name="${SEQPREFIX}rssop" value=""/>
 <input type="hidden" name="${SEQPREFIX}rssindex" value=""/>
-<input type="hidden" name="${SEQPREFIX}rssmapcount" value="$REGEXP.size()"/>
+<input type="hidden" name="${SEQPREFIX}rssmapcount" 
value="$REGEXPLIST.size()"/>
 
 <table class="displaytable">
   <tr><td class="separator" colspan="4"><hr/></td></tr>
@@ -36,10 +36,10 @@
     <td class="value">
     #set( $MATCH = $MATCHSTRINGS.get($foreach.index))
       <input type="hidden" name="${PREFIX}map" 
value="$Encoder.attributeEscape($MATCH)"/>
-    #if($MATCH)
-      $Encoder.bodyEscape($MATCH)
+    #if($MATCH.length() == 0)
+      &lt;as is&gt;
     #else
-    &lt;as is&gt;
+      $Encoder.bodyEscape($MATCH)
     #end
     </td>
   </tr>
@@ -63,7 +63,7 @@
   <input type="hidden" name="${SEQPREFIX}rssmapcount" value="$COUNTER"/>
   #foreach($REGEXP in $REGEXPLIST)
     #set( $PREFIX = $SEQPREFIX + "rssregexp_" + $foreach.index +"_" )
-  <input type="hidden" name="${PREFIX}match" 
value="$Encoder.attributeEscape($REGEXP)"/>$Encoder.bodyEscape($REGEXP)</td>
+  <input type="hidden" name="${PREFIX}match" 
value="$Encoder.attributeEscape($REGEXP)"/>
     #set( $MATCH = $MATCHSTRINGS.get($foreach.index))
   <input type="hidden" name="${PREFIX}map" 
value="$Encoder.attributeEscape($MATCH)"/>
   #end

Modified: 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Metadata.html.vm
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Metadata.html.vm?rev=1792828&r1=1792827&r2=1792828&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Metadata.html.vm
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Metadata.html.vm
 Wed Apr 26 23:39:59 2017
@@ -31,7 +31,7 @@
 </table>
 #else
 <input type="hidden" name="${SEQPREFIX}excludedheaders_present" value="true"/>
-  #foreach($potentiallyExcludedHeader in $POTENTIALLYEXCLUDEDHEADERS)
-<input type="hidden" name="${SEQPREFIX}excludedheaders" 
value="$Encoder.attributeEscape($potentiallyExcludedHeader)" />
+  #foreach($excludedHeader in $EXCLUDEDHEADERS)
+<input type="hidden" name="${SEQPREFIX}excludedheaders" 
value="$Encoder.attributeEscape($excludedHeader)" />
   #end
 #end

Modified: 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Security.html.vm
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Security.html.vm?rev=1792828&r1=1792827&r2=1792828&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Security.html.vm
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Security.html.vm
 Wed Apr 26 23:39:59 2017
@@ -27,7 +27,7 @@
       <input type="hidden" name="$ACCESSOPNAME" value=""/>
       <input type="hidden" name="${SEQPREFIX}spectoken${ACCESSDESC}" 
value="$Encoder.attributeEscape($TOKEN)" />
       <a name="${SEQPREFIX}token_${foreach.index}">
-        <input type="button" 
value="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.Delete'))"
 
onClick='Javascript:${SEQPREFIX}SpecOp("$ACCESSOPNAME","Delete","${SEQPREFIX}token_${foreach.index}")'
 alt="??"/>
+        <input type="button" 
value="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.Delete'))"
 
onClick='Javascript:${SEQPREFIX}SpecOp("$ACCESSOPNAME","Delete","${SEQPREFIX}token_${foreach.index}")'
 
alt="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.DeleteToken'))$foreach.index"/>
       </a>&nbsp;
     </td>
     <td class="value">
@@ -44,7 +44,7 @@
   <tr><td class="lightseparator" colspan="2"><hr/></td></tr>
   <tr>
     <td class="description">
-      <input type="hidden" name="${SEQPREFIX}tokencount" value="?"/>
+      <input type="hidden" name="${SEQPREFIX}tokencount" value="$COUNTER"/>
       <input type="hidden" name="${SEQPREFIX}accessop" value=""/>
       <a name="${SEQPREFIX}token_${COUNTER}">
         <input type="button" 
value="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.Add'))"
 onClick='Javascript:${SEQPREFIX}SpecAddToken("${SEQPREFIX}token_${COUNTER}")' 
alt="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.AddAccessToken'))"/>

Reply via email to