svn commit: r1684866 - in /manifoldcf/trunk: CHANGES.txt connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java

[kw...@apache.org]

Author: kwright
Date: Thu Jun 11 12:35:07 2015
New Revision: 1684866

URL: http://svn.apache.org/r1684866
Log:
Tentative fix for CONNECTORS-1203.

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1684866&r1=1684865&r2=1684866&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Thu Jun 11 12:35:07 2015
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 2.2-dev =====================
 
+CONNECTORS-1203: SharePoint connector did not consistently use
+internal metadata names throughout.
+(Dale Dreiske, Karl Wright)
+
 CONNECTORS-1212: Fix export/import of jobs to handle max
 intervals.
 (Kevin J. Walsh, Karl Wright)

Modified: manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java?rev=1684866&r1=1684865&r2=1684866&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java (original)
+++ manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java Thu Jun 11 12:35:07 2015
@@ -854,7 +854,7 @@ public class SharePointRepository extend
             
             String[] fields = new String[fieldNames.size()];
             int j = 0;
-            for (String field : fieldNames.keySet())
+            for (String field : fieldNames.values())
             {
               fields[j++] = field;
             }
@@ -1306,7 +1306,7 @@ public class SharePointRepository extend
             
             String[] fields = new String[fieldNames.size()];
             int j = 0;
-            for (String field : fieldNames.keySet())
+            for (String field : fieldNames.values())
             {
               fields[j++] = field;
             }
@@ -4470,7 +4470,7 @@ public class SharePointRepository extend
   protected static class MetadataInformation
   {
     protected boolean allMetadata = false;
-    protected HashMap metadataFields = new HashMap();
+    protected Set<String> metadataFields = new HashSet<String>();
 
     /** Constructor */
     public MetadataInformation()
@@ -4486,7 +4486,7 @@ public class SharePointRepository extend
     /** Add a metadata field */
     public void addMetadataField(String fieldName)
     {
-      metadataFields.put(fieldName,fieldName);
+      metadataFields.add(fieldName);
     }
 
     /** Get whether "all metadata" is to be used */
@@ -4499,11 +4499,10 @@ public class SharePointRepository extend
     public String[] getMetadataFields()
     {
       String[] rval = new String[metadataFields.size()];
-      Iterator iter = metadataFields.keySet().iterator();
       int i = 0;
-      while (iter.hasNext())
+      for (String field : metadataFields)
       {
-        rval[i++] = (String)iter.next();
+        rval[i++] = field;
       }
       return rval;
     }