整理代码

DigitalPlatform · Jun 5, 2016 · c22f20a · c22f20a
1 parent 8d6b13c
commit c22f20a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 143 deletions.
diff --git a/dp2Command.Server/ImgManager.cs b/dp2Command.Server/ImgManager.cs
diff --git a/dp2Command.Server/dp2CmdService2.cs b/dp2Command.Server/dp2CmdService2.cs
@@ -220,7 +220,7 @@ public void SetDp2mserverInfo(string dp2mserverUrl,
                 root.AppendChild(nodeDp2mserver);
             }
             DomUtil.SetAttr(nodeDp2mserver, "url", dp2mserverUrl);
-            DomUtil.SetAttr(nodeDp2mserver, "username", userName);        
+            DomUtil.SetAttr(nodeDp2mserver, "username", userName);
             string encryptPassword = Cryptography.Encrypt(password, dp2CmdService2.EncryptKey);
             DomUtil.SetAttr(nodeDp2mserver, "password", encryptPassword);
             dom.Save(this._cfgFile);
@@ -2150,8 +2150,6 @@ public long SearchBiblio(string remoteUserName,
             try
             {
 
-            REDO1:
-
                 CancellationToken cancel_token = new CancellationToken();
                 string id = Guid.NewGuid().ToString();
                 SearchRequest request = new SearchRequest(id,
@@ -2167,11 +2165,9 @@ public long SearchBiblio(string remoteUserName,
                     count);
 
                 int tempNo = connIndex;// connIndex % 2;
-
                 MessageConnection connection = this._channels.GetConnectionAsync(
                     this.dp2MServerUrl,
-                    remoteUserName + tempNo).Result;
-
+                    remoteUserName).Result;  //+ tempNo todo
                 connIndex++;
 
                 SearchResult result = connection.SearchAsync(
@@ -2221,7 +2217,7 @@ public long SearchBiblio(string remoteUserName,
                 if (result.Records.Count > 0 && start+result.Records.Count < result.ResultCount)
                 {
                     start += result.Records.Count;
-                    goto REDO1;
+                    //goto REDO1;
                 }
 
                 return records.Count;

diff --git a/dp2Command.Server/dp2Command.Service.csproj b/dp2Command.Server/dp2Command.Service.csproj
@@ -65,7 +65,6 @@
     <Compile Include="dp2BaseCommandService.cs" />
     <Compile Include="dp2CommandService.cs" />
     <Compile Include="dp2CmdService2.cs" />
-    <Compile Include="ImgManager.cs" />
     <Compile Include="Interface\MessageInterface.cs" />
     <Compile Include="Interface\ScriptManager.cs" />
     <Compile Include="MsgRouter.cs" />
@@ -114,7 +113,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="delete.txt" />
-    <Content Include="XMLFile1.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.