Changeset 32912 for lang

Timestamp:

04/28/09 21:20:47 (4 years ago)

Author:

hoge1e3

Message:

#150 複数語検索 と #144

Location:

lang/csharp/soyText/soyText

Files:

• AndCondition.cs (added)
• AnyCondition.cs (added)
• DocumentSercher.cs (modified) (4 diffs)
• DocumentSet.cs (modified) (1 diff)
• Form1.cs (modified) (3 diffs)
• KeywordCondition.cs (added)
• SearchCondition.cs (modified) (1 diff)
• TerminableThread.cs (modified) (1 diff)
• bin/Debug/soyText.application (modified) (1 diff)
• bin/Debug/soyText.exe (modified) (previous)
• bin/Debug/soyText.exe.manifest (modified) (2 diffs)
• bin/Debug/soyText.pdb (modified) (previous)
• bin/Debug/soyText.vshost.application (modified) (1 diff)
• soyText.csproj (modified) (3 diffs)

lang/csharp/soyText/soyText/DocumentSercher.cs

@@ -6 +6 @@
 namespace SoyText
 {
-    class DocumentSercher
+    public class DocumentSercher
     {
-        DocumentSet documentSet;
-        SearchCondition searchCondition;
-        FoundHandler foundHandler;
+        public DocumentSet documentSet;
+        public SearchCondition searchCondition;
+        public FoundHandler foundHandler;
+        bool terminated = false;
+        public void terminate() { terminated = true; }
         public SortedList<long, Document> search()
         {
@@ -20 +22 @@
             }
             var res = new SortedList<long, Document>();
-            if (searchCondition == null || searchCondition.isAny)
+            if (searchCondition == null || searchCondition is AnyCondition)
             {
                 foreach (var d in rec)
@@ -27 +29 @@
                     if (a == FoundHandlerAction.End) break;
                     if (a == FoundHandlerAction.Accept) res.Add(d.Key, d.Value);
+                    if (terminated) break;
                 }
                 return res;
@@ -45 +48 @@
                     }
                 }
+                if (terminated) break;
             }
             Debug.print("完了： 文書を検索: " + searchCondition);

lang/csharp/soyText/soyText/DocumentSet.cs

@@ -97 +97 @@
             return maxHandle;
         }
+        public DocumentSercher createDocumentSearcher(String kw, FoundHandler f)
+        {
+            var s = new DocumentSercher();
+            s.searchCondition = SearchCondition.fromExpression(kw);
+            s.foundHandler = f;
+            s.documentSet = this;
+            return s;
+        }
         public SortedList<long,Document> search(String kw, FoundHandler f)
         {
-            var rec0 = getRecents();
-            var rec = new SortedList<long, Document>();
-            lock (rec0)
-            {
-                foreach (var d in rec0) rec.Add(d.Key, d.Value);
-            }
-            var res = new SortedList<long, Document>();
-            if (kw == null || kw.Equals(""))
-            {
-                foreach (var d in rec)
-                { 
-                    var a = f(d.Value);
-                    if (a == FoundHandlerAction.End) break;
-                    if (a == FoundHandlerAction.Accept) res.Add(d.Key,d.Value);
-                }
-                return res;
-            }
-            var t = workspace.indexer.createToken(kw);
-            /*Debug.print("文字検索: " + kw);
-            foreach (var st in t.existentSuperstrings)
-            {
-                var ress = exactSearch(st);
-                foreach (var d in ress) {
-                    if (!res.ContainsKey(d.Key))
-                    {
-                        res.Add(d.Key, d.Value);
-                    }
-                }
-            }*/
-            var c=rec.Count;
-            var cnt = 0;
-            foreach (var d in rec)
-            {
-                Debug.print("文書を検索: " + kw+"("+cnt+"/"+c+") - "+res.Count+"件見つかりました");
-                cnt++;
-                if (d.Value.matches(kw))
-                {
-                    if (!res.ContainsKey(d.Key))
-                    {
-                        var a=f(d.Value);
-                        if (a == FoundHandlerAction.End) break;
-                        if (a == FoundHandlerAction.Accept) res.Add(d.Key, d.Value);
-                    }
-                }
-            }
-            Debug.print("完了： 文書を検索: " + kw);
-            
-            //var resList = res.ToList();
-            //Debug.print("検索結果の並べ替え: "+kw);
-            //resList.Sort(byRecency);
-            //Debug.print("End: 検索結果の並べ替え: " + kw);
-            return res;
-
+            var s = createDocumentSearcher(kw, f);
+            return s.search();
         }
+        
         private SortedList<long, Document> exactSearch(Token t)
         {

lang/csharp/soyText/soyText/Form1.cs

@@ -67 +67 @@
         }
         TerminableThread searchThread = new TerminableThread();
+        DocumentSercher documentSearcher;
         public void refreshList(String kw)
         {
             if (kw == "" || kw==null) Text = "soyText";
             else Text = kw + " - " + "soyText";
-
+            if (documentSearcher != null) documentSearcher.terminate();
             searchThread.exec(delegate(TerminableThread t)
             {
@@ -79 +80 @@
                     docListBox.Items.Clear();
                 });
-                SortedList<long, Document> res = documentSet.search(kw, delegate(Document d)
+                documentSearcher = documentSet.createDocumentSearcher(kw,
+                delegate(Document d)
                 {
                     cnt++;
-                    if (cnt < 100 && !t.terminated)
+                    if (cnt < 100)
                     {
                         syncUI(delegate() { docListBox.Items.Add(d); });
@@ -93 +95 @@
                     }
                 });
+                documentSearcher.search();
                 statusText = "完了";
             });

lang/csharp/soyText/soyText/SearchCondition.cs

@@ -6 +6 @@
 namespace SoyText
 {
-    public class SearchCondition
+    public abstract class SearchCondition
     {
-        String word;
-        public bool matches(Document d)
-        {
-            return d.content.IndexOf(word) >= 0;
-        }
-        public bool matches(DocumentLine line)
-        {
-            return line.content.IndexOf(word) >= 0;
-        }
+        public abstract bool matches(Document d);
+        public abstract bool matches(DocumentLine d);
         public static SearchCondition fromExpression(String expr)
         {
-            var r = new SearchCondition();
-            r.word = expr;
-            return r;
-        }
-        public bool isAny { get { return word == ""; } }
-        public override string ToString()
-        {
-            return word;
+            if (expr == null || expr == "") return new AnyCondition();
+            string[] s = expr.Split(' ');
+            if (s.Length == 1)
+            {
+                return new KeywordCondition(expr);
+            }
+            if (s.Length == 0)
+            {
+                return new AnyCondition();
+            }
+            var res = new AndCondition();
+            foreach (var e in s)
+            {
+                res.add(fromExpression(e));
+            }
+            return res;
         }
     }

lang/csharp/soyText/soyText/TerminableThread.cs

@@ -28 +28 @@
                         {
                             r = nextRun;
+                            nextRun = null;
                             _running = true;
                             terminated = false;

lang/csharp/soyText/soyText/bin/Debug/soyText.application

@@ -12 +12 @@
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>j6hhuQVWYtfWkwy8j3nFgirX6hk=</dsig:DigestValue>
+        <dsig:DigestValue>b4VFJRybu2kjnO+ggm9SDfFqbuo=</dsig:DigestValue>
       </hash>
     </dependentAssembly>

lang/csharp/soyText/soyText/bin/Debug/soyText.exe.manifest

@@ -53 +53 @@
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="soyText.exe" size="45568">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="soyText.exe" size="46080">
       <assemblyIdentity name="soyText" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
@@ -60 +60 @@
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>EHWhcOuAInIwLvFSenDNLPBrS1s=</dsig:DigestValue>
+        <dsig:DigestValue>yJYEl9jmz0Myd9vk+kUqmHKRDv4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>

lang/csharp/soyText/soyText/bin/Debug/soyText.vshost.application

@@ -12 +12 @@
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>j6hhuQVWYtfWkwy8j3nFgirX6hk=</dsig:DigestValue>
+        <dsig:DigestValue>b4VFJRybu2kjnO+ggm9SDfFqbuo=</dsig:DigestValue>
       </hash>
     </dependentAssembly>

lang/csharp/soyText/soyText/soyText.csproj

@@ -70 +70 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AndCondition.cs" />
     <Compile Include="Debug.cs" />
     <Compile Include="Document.cs" />
     <Compile Include="DocumentImporter.cs" />
     <Compile Include="DocumentLine.cs" />
+    <Compile Include="AnyCondition.cs" />
     <Compile Include="DocumentSercher.cs" />
     <Compile Include="DocumentSet.cs" />
@@ -125 +127 @@
     </Compile>
     <Compile Include="Inclusion.cs" />
+    <Compile Include="KeywordCondition.cs" />
     <Compile Include="SearchCondition.cs" />
     <Compile Include="Str.cs" />
@@ -171 +174 @@
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Search\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.