整理代码

Author: DigitalPlatform

DigitalPlatform.LibraryServer.Common/BarcodeValidator.cs

@@ -174,6 +174,66 @@ public ValidateResult Validate(string location,
             };
         }
 
+        // 2021/1/18
+        /*
+           <validator>
+               <patron>
+                   <CMIS />
+                   <range value='P000001-P999999' />
+               </patron>
+               <entity>
+                   <range value='0000001-9999999'></range>
+               </entity>
+               <shelf>
+                   <range value='0101-0909'></range>
+               </shelf>
+           </validator>
+        * */
+        // 单独验证一种类型的号码
+        // type 为 "patron" "entity" "shelf" 之一
+        public ValidateResult ValidateByType(
+            string type,
+            string barcode)
+        {
+            XmlElement validator = _dom.DocumentElement;
+            /*
+            if (validator.GetAttributeNode("suppress") != null)
+            {
+                string comment = validator.GetAttribute("suppress");
+                if (string.IsNullOrEmpty(comment))
+                    comment = $"馆藏地 '{location}' 不打算定义验证规则";
+                return new ValidateResult
+                {
+                    OK = false,
+                    ErrorInfo = comment,
+                    ErrorCode = "suppressed"    // 不打算定义验证规则
+                };
+            }
+            */
+
+            XmlNodeList patron_or_entitys = validator.SelectNodes(type);
+            foreach (XmlElement patron_or_entity in patron_or_entitys)
+            {
+                var ret = ProcessEntry(patron_or_entity,
+                    barcode);
+                if (ret == true)
+                {
+                    return new ValidateResult
+                    {
+                        OK = true,
+                        Type = patron_or_entity.Name,
+                    };
+                }
+            }
+
+            return new ValidateResult
+            {
+                OK = false,
+                ErrorInfo = $"号码 '{barcode}' 不是合法的 {type} 类型号码",
+                ErrorCode = "notMatch"
+            };
+        }
+
         public TransformResult Transform(string location,
     string barcode)
         {
@@ -470,7 +530,7 @@ static string GetString(Engine engine, string name, string default_value)
         // return:
         //      false   barcode 不在定义的范围内
         //      true    barcode 在定义的范围内
-        bool ProcessEntry(XmlElement container,
+        public static bool ProcessEntry(XmlElement container,
             string barcode)
         {
             XmlNodeList nodes = container.SelectNodes("*");

RfidCenter/RfidCenter.csproj

@@ -31,7 +31,7 @@
     <SuiteName>dp2 V3</SuiteName>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>73</ApplicationRevision>
+    <ApplicationRevision>74</ApplicationRevision>
     <ApplicationVersion>1.4.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>

RfidDrivers.First/RfidDriver1.cs

@@ -388,11 +388,13 @@ static List<Reader> OpenComReaders(Hashtable name_table,
 
             string[] rates = new string[] {
                 "38400",    // 最常见的放在最前面
+                /*
                 "19200",
                 "9600",
                 "57600",
                 "115200",
                 "230400",
+                */
             };
 
             // 打开所有的 reader

RfidTool/BeginModifyDialog.Designer.cs

@@ -33,6 +33,8 @@ public string UiState
                     this.textBox_rfid_aoi,
                     this.checkBox_uidPiiMap,
                     this.comboBox_eas,
+                    this.checkBox_verifyPii,
+                    // this.textBox_verifyRule,
                 };
                 return GuiState.GetUiState(controls);
             }
@@ -47,6 +49,8 @@ public string UiState
                     this.textBox_rfid_aoi,
                     this.checkBox_uidPiiMap,
                     this.comboBox_eas,
+                    this.checkBox_verifyPii,
+                    // this.textBox_verifyRule,
                 };
                 GuiState.SetUiState(controls, value);
             }
@@ -220,6 +224,38 @@ public bool WriteUidPiiLog
             }
         }
 
+        // 是否校验 PII
+        public bool VerifyPii
+        {
+            get
+            {
+                return this.checkBox_verifyPii.Checked;
+            }
+            set
+            {
+                this.checkBox_verifyPii.Checked = value;
+            }
+        }
+
+        // 校验规则 XML 代码
+        public string PiiVerifyRule
+        {
+            /*
+            get
+            {
+                return this.textBox_verifyRule.Text;
+            }
+            set
+            {
+                this.textBox_verifyRule.Text = value;
+            }
+            */
+            get
+            {
+                return DataModel.PiiVerifyRule;
+            }
+        }
+
         private void comboBox_eas_TextChanged(object sender, EventArgs e)
         {
             if (string.IsNullOrEmpty(this.comboBox_eas.Text)
@@ -244,5 +280,15 @@ private void checkBox_writeUidLog_CheckedChanged(object sender, EventArgs e)
                 this.checkBox_writeUidLog.BackColor = Color.Transparent;
             }
         }
+
+        private void BeginModifyDialog_Load(object sender, EventArgs e)
+        {
+            // this.textBox_verifyRule.Text = DataModel.PiiVerifyRule;
+        }
+
+        private void button_modifyVerifyRule_Click(object sender, EventArgs e)
+        {
+            MainForm.OpenSettingDialog(this, "activateVerifyRule");
+        }
     }
 }

RfidTool/BeginModifyDialog.cs

@@ -340,6 +340,33 @@ public static int BeforeScanSeconds
             }
         }
 
+        // PII 号码校验规则
+        public static string PiiVerifyRule
+        {
+            get
+            {
+                return ClientInfo.Config.Get("general", "pii_verify_rule", null);
+            }
+            set
+            {
+                ClientInfo.Config.Set("general", "pii_verify_rule", value);
+            }
+        }
+
+        // 当写入标签的时候是否校验条码号
+        public static bool VerifyPiiWhenWriteTag
+        {
+            get
+            {
+                return ClientInfo.Config.GetBoolean("writeTag", "verifyBarcode", false);
+            }
+            set
+            {
+                ClientInfo.Config.SetBoolean("writeTag", "verifyBarcode", value);
+            }
+
+        }
+
         // 写入标签
         public static NormalResult WriteTagInfo(string one_reader_name,
             TagInfo old_tag_info,

RfidTool/DataModel.cs

@@ -557,13 +557,19 @@ private void MenuItem_writeBookTags_Click(object sender, EventArgs e)
 
         // 设置
         private void MenuItem_settings_Click(object sender, EventArgs e)
+        {
+            OpenSettingDialog(this);
+        }
+
+        public static void OpenSettingDialog(Form parent,
+            string style = "")
         {
             using (SettingDialog dlg = new SettingDialog())
             {
-                GuiUtil.SetControlFont(dlg, this.Font);
+                GuiUtil.SetControlFont(dlg, parent.Font);
                 ClientInfo.MemoryState(dlg, "settingDialog", "state");
-
-                dlg.ShowDialog(this);
+                dlg.OpenStyle = style;
+                dlg.ShowDialog(parent);
                 if (dlg.DialogResult == DialogResult.OK)
                     DataModel.TagList.EnableTagCache = DataModel.EnableTagCache;
             }