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

[kwright]

Author: kwright
Date: Mon Mar  7 14:22:43 2016
New Revision: 1733933

URL: http://svn.apache.org/viewvc?rev=1733933&view=rev
Log:
Fix for CONNECTORS-1284.

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=1733933&r1=1733932&r2=1733933&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Mar  7 14:22:43 2016
@@ -3,6 +3,11 @@ $Id$
 
 ======================= 2.4-dev =====================
 
+CONNECTORS-1284: SharePoint fields that do not have a different
+display name from their field name (or which are defined in some way
+as yet not well understood) were being overlooked in SharePoint crawling.
+(Markus Schuch, Karl Wright)
+
 CONNECTORS-1283: "Document has no version" signal was not working.
 This problem has been around since MCF 1.8/2.0.  The fix is simple but
 may change the functioning of some custom repository connectors.  This

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=1733933&r1=1733932&r2=1733933&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
 Mon Mar  7 14:22:43 2016
@@ -854,9 +854,10 @@ public class SharePointRepository extend
             
             String[] fields = new String[fieldNames.size()];
             int j = 0;
-            for (String field : fieldNames.values())
+            for (String field : fieldNames.keySet())
             {
-              fields[j++] = field;
+              String value = fieldNames.get(field);
+              fields[j++] = (value==null)?field:value;
             }
                   
             String[] accessTokens;
@@ -1306,9 +1307,10 @@ public class SharePointRepository extend
             
             String[] fields = new String[fieldNames.size()];
             int j = 0;
-            for (String field : fieldNames.values())
+            for (String field : fieldNames.keySet())
             {
-              fields[j++] = field;
+              String value = fieldNames.get(field);
+              fields[j++] = (value==null)?field:value;
             }
                   
             String[] accessTokens;