Return-Path: X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 16963DFC3 for ; Wed, 15 May 2013 19:33:49 +0000 (UTC) Received: (qmail 23169 invoked by uid 500); 15 May 2013 19:33:49 -0000 Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org Received: (qmail 23109 invoked by uid 500); 15 May 2013 19:33:48 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 23096 invoked by uid 99); 15 May 2013 19:33:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 May 2013 19:33:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,WEIRD_QUOTING X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 May 2013 19:33:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4C80723889F1; Wed, 15 May 2013 19:33:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1483032 - in /manifoldcf/branches/CONNECTORS-689/connectors/livelink/connector/src/main: java/org/apache/manifoldcf/crawler/connectors/livelink/ native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/ Date: Wed, 15 May 2013 19:33:27 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130515193327.4C80723889F1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kwright Date: Wed May 15 19:33:26 2013 New Revision: 1483032 URL: http://svn.apache.org/r1483032 Log: Add UI support for UI user workspace checkbox Modified: manifoldcf/branches/CONNECTORS-689/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java manifoldcf/branches/CONNECTORS-689/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_en_US.properties manifoldcf/branches/CONNECTORS-689/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_ja_JP.properties Modified: manifoldcf/branches/CONNECTORS-689/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-689/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java?rev=1483032&r1=1483031&r2=1483032&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-689/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java (original) +++ manifoldcf/branches/CONNECTORS-689/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java Wed May 15 19:33:26 2013 @@ -1002,7 +1002,7 @@ public class LivelinkConnector extends o if (Logging.connectors.isDebugEnabled()) Logging.connectors.debug("Livelink: Found a user: ID="+Integer.toString(childID)); - activities.addSeedDocument("U0:"+Integer.toString(childID)); + activities.addSeedDocument("F0:"+Integer.toString(childID)); } break; } @@ -2479,10 +2479,32 @@ public class LivelinkConnector extends o int k; // Paths tab + boolean userWorkspaces = false; + i = 0; + while (i < ds.getChildCount()) + { + SpecificationNode sn = ds.getChild(i++); + if (sn.getType().equals("userworkspace")) + { + String value = sn.getAttributeValue("value"); + if (value != null && value.equals("true")) + userWorkspaces = true; + } + } if (tabName.equals(Messages.getString(locale,"LivelinkConnector.Paths"))) { out.print( "\n"+ +" \n"+ +" \n"+ +" \n"+ +" \n"+ +" \n"+ " \n" ); // Now, loop through paths @@ -2614,7 +2636,9 @@ public class LivelinkConnector extends o } } out.print( -"\n" +"\n"+ +"\n"+ +"\n" ); } @@ -3207,6 +3231,24 @@ public class LivelinkConnector extends o public String processSpecificationPost(IPostParameters variableContext, Locale locale, DocumentSpecification ds) throws ManifoldCFException { + String userWorkspacesPresent = variableContext.getParameter("userworkspace_present"); + if (userWorkspacesPresent != null) + { + String value = variableContext.getParameter("userworkspace"); + int i = 0; + while (i < ds.getChildCount()) + { + SpecificationNode sn = ds.getChild(i); + if (sn.getType().equals("userworkspace")) + ds.removeChild(i); + else + i++; + } + SpecificationNode sn = new SpecificationNode("userworkspace"); + sn.setAttribute("value",value); + ds.addChild(ds.getChildCount(),sn); + } + String xc = variableContext.getParameter("pathcount"); if (xc != null) { @@ -3702,6 +3744,35 @@ public class LivelinkConnector extends o " \n" ); int i = 0; + boolean userWorkspaces = false; + while (i < ds.getChildCount()) + { + SpecificationNode sn = ds.getChild(i++); + if (sn.getType().equals("userworkspace")) + { + String value = sn.getAttributeValue("value"); + if (value != null && value.equals("true")) + userWorkspaces = true; + } + } + + out.print( +" \n"+ +" \n"+ +" " + ); + out.print( +" \n" + ); + out.print( +" " + ); + + i = 0; boolean seenAny = false; while (i < ds.getChildCount()) { Modified: manifoldcf/branches/CONNECTORS-689/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_en_US.properties URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-689/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_en_US.properties?rev=1483032&r1=1483031&r2=1483032&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-689/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_en_US.properties (original) +++ manifoldcf/branches/CONNECTORS-689/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_en_US.properties Wed May 15 19:33:26 2013 @@ -88,7 +88,7 @@ LivelinkConnector.AddFileSpecification=A LivelinkConnector.Include=Include LivelinkConnector.Exclude=Exclude LivelinkConnector.SecurityColon=Security: -LivelinkConnector.Enabled=Enabled  +LivelinkConnector.Enabled=Enabled LivelinkConnector.Disabled=Disabled LivelinkConnector.DeleteToken=Delete token # LivelinkConnector.AddAccessToken=Add access token @@ -143,3 +143,4 @@ LivelinkConnector.EnterTheServerCgiPathT LivelinkConnector.TheServerCgiPathMustBeginWithACharacter=The server CGI path must begin with a '/' character LivelinkConnector.Delete=Delete LivelinkConnector.Add=Add +LivelinkConnector.CrawlUserWorkspaces=Crawl user workspaces? Modified: manifoldcf/branches/CONNECTORS-689/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_ja_JP.properties URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-689/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_ja_JP.properties?rev=1483032&r1=1483031&r2=1483032&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-689/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_ja_JP.properties (original) +++ manifoldcf/branches/CONNECTORS-689/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_ja_JP.properties Wed May 15 19:33:26 2013 @@ -143,3 +143,4 @@ LivelinkConnector.EnterTheServerCgiPathT LivelinkConnector.TheServerCgiPathMustBeginWithACharacter=The server CGI path must begin with a '/' character LivelinkConnector.Delete=削除 LivelinkConnector.Add=追加 +LivelinkConnector.CrawlUserWorkspaces=Crawl user workspaces?
\n"+ +" "+Messages.getBodyString(locale,"LivelinkConnector.CrawlUserWorkspaces")+"\n"+ +" \n"+ +" \n"+ +" \n"+ +"
\n"+ +" "+Messages.getBodyString(locale,"LivelinkConnector.CrawlUserWorkspaces")+"\n"+ +" \n"+ +" "+(userWorkspaces?Messages.getBodyString(locale,"LivelinkConnector.Yes"):Messages.getBodyString(locale,"LivelinkConnector.No"))+"\n"+ +"