Merge pull request #9 from DigitalPlatform/master

同步源
DigitalPlatform · Nov 5, 2018 · 08b1d30 · 08b1d30
2 parents b5f412c + 4902fec
commit 08b1d30
Show file tree

Hide file tree

Showing 103 changed files with 6,586 additions and 1,263 deletions.
diff --git a/DigitalPlatform.AmazonInterface/AmazonSearch.cs b/DigitalPlatform.AmazonInterface/AmazonSearch.cs
@@ -880,7 +880,7 @@ int LoadResults(XmlDocument response_dom,
 
         static string Join(ICollection list)
         {
-            StringBuilder text = new StringBuilder(4096);
+            StringBuilder text = new StringBuilder();
             foreach (string s in list)
             {
                 if (text.Length > 0)
@@ -996,7 +996,7 @@ static string GetFieldValues(XmlNode root,
             string strXPath,
             string strSep)
         {
-            StringBuilder text = new StringBuilder(4096);
+            StringBuilder text = new StringBuilder();
             XmlNodeList nodes = root.SelectNodes(strXPath, nsmgr);
             foreach (XmlNode node in nodes)
             {

diff --git a/DigitalPlatform.CirculationClient/dp2ResTree.cs b/DigitalPlatform.CirculationClient/dp2ResTree.cs
@@ -367,7 +367,7 @@ public static string SaveSortTables(Hashtable sort_table)
             if (sort_table == null)
                 return "";
 
-            StringBuilder strResult = new StringBuilder(4096);
+            StringBuilder strResult = new StringBuilder();
             foreach (string key in sort_table.Keys)
             {
                 List<string> values = (List<string>)sort_table[key];

diff --git a/DigitalPlatform.CommonControl/GuiState.cs b/DigitalPlatform.CommonControl/GuiState.cs
@@ -702,7 +702,7 @@ public static void SetUiState(List<object> controls,
         // 获得表示控件状态的字符串
         public static string GetUiState(List<object> controls)
         {
-            StringBuilder text = new StringBuilder(4096);
+            StringBuilder text = new StringBuilder();
 
             foreach (object obj in controls)
             {

diff --git a/DigitalPlatform.CommonControl/OrderDesignControl.cs b/DigitalPlatform.CommonControl/OrderDesignControl.cs
@@ -1758,7 +1758,6 @@ string IsDistributeControlled(string strDistribute)
                     continue;
                 }
 
-
                 // 解析
                 dp2StringUtil.ParseCalendarName(location.Name,
             out string strLibraryCode,
@@ -1767,7 +1766,7 @@ string IsDistributeControlled(string strDistribute)
                 codes.Add(strLibraryCode);
             }
 
-            StringUtil.RemoveDup(ref codes);
+            StringUtil.RemoveDupNoSort(ref codes);
 
             // 检查馆代码是否在管辖范围内
             if (this.VerifyLibraryCode != null)

diff --git a/DigitalPlatform.CommonControl/dp2QueryControl.cs b/DigitalPlatform.CommonControl/dp2QueryControl.cs
@@ -155,7 +155,7 @@ static string BuildFromList(string strDbNameList,
                 return strDbNameList + ":" + strFromList;
 
             string[] dbname_list = strDbNameList.Split(new char[] { ',' });
-            StringBuilder result = new StringBuilder(4096);
+            StringBuilder result = new StringBuilder();
             foreach (string dbname in dbname_list)
             {
                 string strDbName = dbname.Trim();

diff --git a/DigitalPlatform.Drawing/QrRecognitionControl.cs b/DigitalPlatform.Drawing/QrRecognitionControl.cs
@@ -419,7 +419,6 @@ private void DecodeBarcode()
             {
                 if (_currentBitmapForDecoding != null)
                 {
-
                     var result = reader.Decode(_currentBitmapForDecoding);
                     if (result != null)
                     {

diff --git a/DigitalPlatform.IO/FileUtil.cs b/DigitalPlatform.IO/FileUtil.cs
@@ -339,7 +339,7 @@ public static int ReadTextFileContent(string strFilePath,
                     else
                     {
                         long lLoadedLength = 0;
-                        StringBuilder temp = new StringBuilder(4096);
+                        StringBuilder temp = new StringBuilder();
                         for (; ; )
                         {
                             string strLine = sr.ReadLine();

diff --git a/DigitalPlatform.LibraryClient/LibraryChannel.cs b/DigitalPlatform.LibraryClient/LibraryChannel.cs
@@ -9783,6 +9783,7 @@ public long GetAuthorNumber(
         }
 
         public long GetPinyin(
+            string strType,
 string strText,
 out string strPinyinXml,
     out string strError)
@@ -9794,6 +9795,7 @@ public long GetPinyin(
             try
             {
                 IAsyncResult soapresult = this.ws.BeginGetPinyin(
+                    strType,
                     strText,
                     null,
                     null);

diff --git a/DigitalPlatform.LibraryClient/Service References/localhost/Reference.cs b/DigitalPlatform.LibraryClient/Service References/localhost/Reference.cs
@@ -3681,10 +3681,10 @@ public interface dp2libraryREST {
         DigitalPlatform.LibraryClient.localhost.LibraryServerResult EndGetAuthorNumber(ref DigitalPlatform.LibraryClient.localhost.Question[] questions, out string strNumber, out string strDebugInfo, System.IAsyncResult result);
 
         [System.ServiceModel.OperationContractAttribute(Action="http://dp2003.com/dp2library/rest/dp2libraryREST/GetPinyin", ReplyAction="http://dp2003.com/dp2library/rest/dp2libraryREST/GetPinyinResponse")]
-        DigitalPlatform.LibraryClient.localhost.LibraryServerResult GetPinyin(out string strPinyinXml, string strText);
+        DigitalPlatform.LibraryClient.localhost.LibraryServerResult GetPinyin(out string strPinyinXml, string strType, string strText);
 
         [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://dp2003.com/dp2library/rest/dp2libraryREST/GetPinyin", ReplyAction="http://dp2003.com/dp2library/rest/dp2libraryREST/GetPinyinResponse")]
-        System.IAsyncResult BeginGetPinyin(string strText, System.AsyncCallback callback, object asyncState);
+        System.IAsyncResult BeginGetPinyin(string strType, string strText, System.AsyncCallback callback, object asyncState);
 
         DigitalPlatform.LibraryClient.localhost.LibraryServerResult EndGetPinyin(out string strPinyinXml, System.IAsyncResult result);
 
@@ -9113,13 +9113,13 @@ public void GetAuthorNumberAsync(string strAuthor, bool bSelectPinyin, bool bSel
                         questions}, this.onEndGetAuthorNumberDelegate, this.onGetAuthorNumberCompletedDelegate, userState);
         }
 
-        public DigitalPlatform.LibraryClient.localhost.LibraryServerResult GetPinyin(out string strPinyinXml, string strText) {
-            return base.Channel.GetPinyin(out strPinyinXml, strText);
+        public DigitalPlatform.LibraryClient.localhost.LibraryServerResult GetPinyin(out string strPinyinXml, string strType, string strText) {
+            return base.Channel.GetPinyin(out strPinyinXml, strType, strText);
         }
 
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public System.IAsyncResult BeginGetPinyin(string strText, System.AsyncCallback callback, object asyncState) {
-            return base.Channel.BeginGetPinyin(strText, callback, asyncState);
+        public System.IAsyncResult BeginGetPinyin(string strType, string strText, System.AsyncCallback callback, object asyncState) {
+            return base.Channel.BeginGetPinyin(strType, strText, callback, asyncState);
         }
 
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
@@ -9128,8 +9128,9 @@ public DigitalPlatform.LibraryClient.localhost.LibraryServerResult EndGetPinyin(
         }
 
         private System.IAsyncResult OnBeginGetPinyin(object[] inValues, System.AsyncCallback callback, object asyncState) {
-            string strText = ((string)(inValues[0]));
-            return this.BeginGetPinyin(strText, callback, asyncState);
+            string strType = ((string)(inValues[0]));
+            string strText = ((string)(inValues[1]));
+            return this.BeginGetPinyin(strType, strText, callback, asyncState);
         }
 
         private object[] OnEndGetPinyin(System.IAsyncResult result) {
@@ -9147,11 +9148,11 @@ private void OnGetPinyinCompleted(object state) {
             }
         }
 
-        public void GetPinyinAsync(string strText) {
-            this.GetPinyinAsync(strText, null);
+        public void GetPinyinAsync(string strType, string strText) {
+            this.GetPinyinAsync(strType, strText, null);
         }
 
-        public void GetPinyinAsync(string strText, object userState) {
+        public void GetPinyinAsync(string strType, string strText, object userState) {
             if ((this.onBeginGetPinyinDelegate == null)) {
                 this.onBeginGetPinyinDelegate = new BeginOperationDelegate(this.OnBeginGetPinyin);
             }
@@ -9162,6 +9163,7 @@ public void GetPinyinAsync(string strText, object userState) {
                 this.onGetPinyinCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnGetPinyinCompleted);
             }
             base.InvokeAsync(this.onBeginGetPinyinDelegate, new object[] {
+                        strType,
                         strText}, this.onEndGetPinyinDelegate, this.onGetPinyinCompletedDelegate, userState);
         }
 
@@ -14308,10 +14310,10 @@ public interface dp2library {
         DigitalPlatform.LibraryClient.localhost.LibraryServerResult EndGetAuthorNumber(ref DigitalPlatform.LibraryClient.localhost.Question[] questions, out string strNumber, out string strDebugInfo, System.IAsyncResult result);
 
         [System.ServiceModel.OperationContractAttribute(Action="http://dp2003.com/dp2library/dp2library/GetPinyin", ReplyAction="http://dp2003.com/dp2library/dp2library/GetPinyinResponse")]
-        DigitalPlatform.LibraryClient.localhost.LibraryServerResult GetPinyin(out string strPinyinXml, string strText);
+        DigitalPlatform.LibraryClient.localhost.LibraryServerResult GetPinyin(out string strPinyinXml, string strType, string strText);
 
         [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://dp2003.com/dp2library/dp2library/GetPinyin", ReplyAction="http://dp2003.com/dp2library/dp2library/GetPinyinResponse")]
-        System.IAsyncResult BeginGetPinyin(string strText, System.AsyncCallback callback, object asyncState);
+        System.IAsyncResult BeginGetPinyin(string strType, string strText, System.AsyncCallback callback, object asyncState);
 
         DigitalPlatform.LibraryClient.localhost.LibraryServerResult EndGetPinyin(out string strPinyinXml, System.IAsyncResult result);
 
@@ -19734,13 +19736,13 @@ public void GetAuthorNumberAsync(string strAuthor, bool bSelectPinyin, bool bSel
                         questions}, this.onEndGetAuthorNumberDelegate, this.onGetAuthorNumberCompletedDelegate, userState);
         }
 
-        public DigitalPlatform.LibraryClient.localhost.LibraryServerResult GetPinyin(out string strPinyinXml, string strText) {
-            return base.Channel.GetPinyin(out strPinyinXml, strText);
+        public DigitalPlatform.LibraryClient.localhost.LibraryServerResult GetPinyin(out string strPinyinXml, string strType, string strText) {
+            return base.Channel.GetPinyin(out strPinyinXml, strType, strText);
         }
 
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public System.IAsyncResult BeginGetPinyin(string strText, System.AsyncCallback callback, object asyncState) {
-            return base.Channel.BeginGetPinyin(strText, callback, asyncState);
+        public System.IAsyncResult BeginGetPinyin(string strType, string strText, System.AsyncCallback callback, object asyncState) {
+            return base.Channel.BeginGetPinyin(strType, strText, callback, asyncState);
         }
 
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
@@ -19749,8 +19751,9 @@ public DigitalPlatform.LibraryClient.localhost.LibraryServerResult EndGetPinyin(
         }
 
         private System.IAsyncResult OnBeginGetPinyin(object[] inValues, System.AsyncCallback callback, object asyncState) {
-            string strText = ((string)(inValues[0]));
-            return this.BeginGetPinyin(strText, callback, asyncState);
+            string strType = ((string)(inValues[0]));
+            string strText = ((string)(inValues[1]));
+            return this.BeginGetPinyin(strType, strText, callback, asyncState);
         }
 
         private object[] OnEndGetPinyin(System.IAsyncResult result) {
@@ -19768,11 +19771,11 @@ private void OnGetPinyinCompleted(object state) {
             }
         }
 
-        public void GetPinyinAsync(string strText) {
-            this.GetPinyinAsync(strText, null);
+        public void GetPinyinAsync(string strType, string strText) {
+            this.GetPinyinAsync(strType, strText, null);
         }
 
-        public void GetPinyinAsync(string strText, object userState) {
+        public void GetPinyinAsync(string strType, string strText, object userState) {
             if ((this.onBeginGetPinyinDelegate == null)) {
                 this.onBeginGetPinyinDelegate = new BeginOperationDelegate(this.OnBeginGetPinyin);
             }
@@ -19783,6 +19786,7 @@ public void GetPinyinAsync(string strText, object userState) {
                 this.onGetPinyinCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnGetPinyinCompleted);
             }
             base.InvokeAsync(this.onBeginGetPinyinDelegate, new object[] {
+                        strType,
                         strText}, this.onEndGetPinyinDelegate, this.onGetPinyinCompletedDelegate, userState);
         }
 

diff --git a/DigitalPlatform.LibraryClient/Service References/localhost/metadata1.xsd b/DigitalPlatform.LibraryClient/Service References/localhost/metadata1.xsd
@@ -307,6 +307,7 @@
   <xs:element name="GetPinyin">
     <xs:complexType>
       <xs:sequence>
+        <xs:element minOccurs="0" name="strType" nillable="true" type="xs:string" />
         <xs:element minOccurs="0" name="strText" nillable="true" type="xs:string" />
       </xs:sequence>
     </xs:complexType>

diff --git a/DigitalPlatform.LibraryClient/Service References/localhost/metadata5.xsd b/DigitalPlatform.LibraryClient/Service References/localhost/metadata5.xsd
@@ -443,6 +443,7 @@
   <xs:element name="GetPinyin">
     <xs:complexType>
       <xs:sequence>
+        <xs:element minOccurs="0" name="strType" nillable="true" type="xs:string" />
         <xs:element minOccurs="0" name="strText" nillable="true" type="xs:string" />
       </xs:sequence>
     </xs:complexType>
-Original file line number
+Diff line change
@@ Expand Up / @@ -419,7 +419,6 @@ private void DecodeBarcode() @@
                 {
                     if (_currentBitmapForDecoding != null)
                     {
                         var result = reader.Decode(_currentBitmapForDecoding);
                         if (result != null)
                         {
@@ Expand Down @@