Changeset 36733 for lang/csharp

Timestamp:

02/13/10 10:53:32 (3 years ago)

Author:

hoge1e3

Message:

 

Location:

lang/csharp/soyText/soyText

Files:

• DocumentList.cs (modified) (2 diffs)
• DocumentListMap.cs (modified) (4 diffs)
• DocumentSearcher.cs (modified) (5 diffs)
• DocumentSet.cs (modified) (4 diffs)
• EditorTab.cs (modified) (9 diffs)
• LoggedDocumentSearcher.cs (modified) (3 diffs)
• SearchLogSet.cs (modified) (4 diffs)
• bin/Debug/soyText.application (modified) (1 diff)
• bin/Debug/soyText.exe (modified) (previous)
• bin/Debug/soyText.exe.manifest (modified) (3 diffs)
• bin/Debug/soyText.pdb (modified) (previous)
• bin/Debug/soyText.vshost.application (modified) (1 diff)
• bin/Release/soyText.application (modified) (2 diffs)
• bin/Release/soyText.exe (modified) (previous)
• bin/Release/soyText.exe.manifest (modified) (3 diffs)
• bin/Release/soyText.pdb (modified) (previous)
• soyText.ico (modified) (previous)
• soyText.suo (modified) (previous)

lang/csharp/soyText/soyText/DocumentList.cs

@@ -3 +3 @@
 using System.Linq;
 using System.Text;
-using System.IO;
-using System.Text.RegularExpressions;
-
+   
 namespace SoyText
 {
-    
-    class DocumentList
-    {
-        DocumentSet documentSet;
-        IDChain first,last;
-        /*List<string> ids = new List<string>();
-        public List<string> idList
-        {
-            get { return ids; }
-        }*/
-        public DocumentList(DocumentSet d) { documentSet = d; init(); }
-        void init()
-        {
-            scanDir();
-
-        }
-        public IEnumerable<IDChain> getIDS()
-        {
-            for (var idc = first; idc != null; idc = idc.next)
-            {
-                yield return idc;
-            }
-        }
-        private void scanDir()
-        {
-          
-            DocumentState state=DocumentState.active;
-            var dir=documentSet.stateDir(state);
-            List<IDInfo> infs = new List<IDInfo>();
-            foreach (string fileName
-               in Mkdir.getFiles(dir))
-            {
-                var m = Regex.Match(fileName, @"([^/\\]+).txt$");
-                if (m.Success)
-                {
-                    var id = m.Groups[1].Value;
-                    infs.Add(new IDInfo(id,File.GetLastWriteTime(documentSet.getFileName(id,state)).Ticks));
-                }
-            }
-            infs.Sort();
-            foreach (var inf in infs) {
-                pushID(inf.id);
-                //Debug.syslog(inf.id);
-            }
-            //Debug.syslog(""+ids.Count);
-        }
-        internal IDChain pushID(string id)
-        {
-            var idc = new IDChain();
-            idc.id = id;
-            idc.prev = last;
-            if (first == null) first = idc;
-            if (last != null)
-            {
-                last.next = idc;
-            }
-            last = idc;
-            return idc;
-        }
-        internal IDChain insertIDChain(IDChain idc)
-        {
-            idc.next = first;
-            idc.prev = null;
-            if (last == null) last = idc;
-            if (first != null)
-            {
-                first.prev = idc;
-            }
-            first = idc;
-            return idc;
-        }
-
-        internal IDChain insertID(string id)
-        {
-            var idc=new IDChain();
-            idc.id=id;
-            insertIDChain(idc);
-            return idc;
-        }
-        internal IDChain removeIDChain(IDChain idc)
-        {
-            if (idc.prev != null)
-            {
-                idc.prev.next = idc.next;
-            }
-            if (idc.next != null)
-            {
-                idc.next.prev = idc.prev;
-            }
-            idc.prev = null;
-            idc.next = null;
-            return idc;
-        }
-        class IDInfo : IComparable
-        {
-            public string id;
-            public long lastUpdate;
-            public IDInfo(string id, long lastUpdate)
-            {
-                this.id = id;
-                this.lastUpdate = lastUpdate;
-            }
-
-            #region IComparable メンバ
-
-            public int CompareTo(object obj)
-            {
-                if (obj is IDInfo)
-                {
-                    IDInfo t = (IDInfo)obj;
-                    if (t.lastUpdate > lastUpdate) return 1;
-                    if (t.lastUpdate < lastUpdate) return -1;
-                }
-                return 0;
-            }
-
-            #endregion
-        }
-
-
-
-    }
-    class IDChain
-    {
-        public string id;
-        public Document document;
-        public IDChain prev, next;
-    }
-    /*
     public class DocumentList: SortedList<long,Document>
     {
@@ -154 +23 @@
             return true;
         }
-    }*/
+    }
 }

lang/csharp/soyText/soyText/DocumentListMap.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
+using System.Linq;   
 using System.Text;
 
@@ -8 +8 @@
     class DocumentListMap
     {
-        private DocumentList list;
-        DocumentSet documentSet;
-        public DocumentListMap(DocumentSet documentSet)
-        {
-            this.documentSet = documentSet;
-            list = new DocumentList(documentSet);
-        }
-        private SortedList<string, IDChain> map = new SortedList<string, IDChain>();
-        //private SortedList<string, Document> removed = new SortedList<string, Document>();
+        private DocumentList list=new DocumentList();
+        private SortedList<string, Document> map = new SortedList<string, Document>();
         public void add(Document d)
         {
-            if (contains(d.id)) return;
-            //list.add(d);
-            var idc=list.insertID(d.id);
-            /*if (removed.ContainsKey(d.id))
-            {
-                removed.Remove(d.id);
-            }*/
-            map.Add(d.id, idc);
+            list.add(d);
+            map.Add(d.id, d);
         }
 
 
-        public IEnumerable<Document> getRecents()
+        internal DocumentList getRecents()
         {
-            foreach (var idc in list.getIDS()) 
-            {   
-                /*if (!removed.ContainsKey(id))
-                {*/
-                    yield return byIdChain(idc);
-                //}
-            }
-            //return list;
-        }
-        public Document byIdChain(IDChain idc)
-        {
-            if (idc.document == null) {
-                 idc.document= documentSet.createDocument(idc.id);
-            }
-            return idc.document;
-        }
-        IDChain getIDChain(string id)
-        {
-            return map[id];
+            return list;
         }
         public Document byId(string id)
         {
-            return byIdChain(getIDChain(id));
+            return map[id];
         }
 
@@ -62 +31 @@
         }
 
-        internal bool update(Document document)
+        internal void update(Document document)
         {
-            if (!remove(document)) return false;
+            if (!contains(document.id)) return;
+            list.Remove(document);
+            map.Remove(document.id);
             document.clearLastUpdate();
             add(document);
-            return true;
         }
 
@@ -73 +43 @@
         {
             if (!contains(document.id)) return false;
-            //list.Remove(document);
-            //removed.Add(document.id, document);
-            list.removeIDChain(getIDChain(document.id));
+            list.Remove(document);
             map.Remove(document.id);
             return true;

lang/csharp/soyText/soyText/DocumentSearcher.cs

@@ -3 +3 @@
 using System.Linq;
 using System.Text;
-
+   
 namespace SoyText
 {
@@ -21 +21 @@
         public IEnumerable<Document> search()
         {
-            var rec = documentSet.getRecents();
-            /*var rec = new DocumentList();
+            var rec0 = documentSet.getRecents();
+            var rec = new DocumentList();
             lock (rec0)
             {
                 foreach (var d in rec0) rec.Add(d.Key, d.Value);
-            }*/
+            }
             //var res = new DocumentList();
             if (searchCondition == null || searchCondition is AnyCondition)
@@ -32 +32 @@
                 foreach (var d in rec)
                 {
-                    if (skip !=0  && d.lastUpdate >= skip)
+                    if (skip !=0  && d.Value.lastUpdate >= skip)
                     {
                         continue;
                     }
-                    yield return d;
+                    yield return d.Value;
                     //res.Add(d.Key, d.Value);
                     if (terminated) break;
@@ -42 +42 @@
                 yield break;
             }
-            var c = 0;// rec.Count;
+            var c = rec.Count;
             var cnt = 0;
             var found = 0;
@@ -49 +49 @@
                 Debug.print("文書を検索: " + searchCondition + "(" + cnt + "/" + c + ") - " + found + "件見つかりました");
                 cnt++;
-                if (skip != 0 && d.lastUpdate >= skip)
+                if (skip != 0 && d.Value.lastUpdate >= skip)
                 {
                     continue;
                 } 
-                if (searchCondition.matches(d))
+                if (searchCondition.matches(d.Value))
                 {
                     //if (!res.ContainsKey(d.Key))
                     //{
                     found++;
-                        yield return d;
+                        yield return d.Value;
                     //    res.Add(d.Key, d.Value);
                     //}

lang/csharp/soyText/soyText/DocumentSet.cs

@@ -5 +5 @@
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading;
-
+using System.Threading;   
+ 
 namespace SoyText
 {
@@ -53 +53 @@
         private Document addToCache(Document d)
         {
-            if (cache == null) cache = new DocumentListMap(this);
+            if (cache == null) cache = new DocumentListMap();
             lock (cache)
             {
@@ -66 +66 @@
         }
         static int count = 0;
-        public IEnumerable<Document> getRecents()
+        public DocumentList getRecents()
         {
-            /*if (cache != null) return cache.getRecents();
+            if (cache != null) return cache.getRecents();
             Debug.syslog("Getrecent called " + (++count) + "times");
             Debug.print("文書一覧取得中...");
+            //var res = new DocumentList();
             
-            searchMax(DocumentState.active, true);*/
-            if (cache == null) cache = new DocumentListMap(this);
-            
+            /*searchMax(DocumentState.active, true);
+            searchMax(DocumentState.archived, false);
+            searchMax(DocumentState.indexed,true);*/
+            searchMax(DocumentState.active, true);
+            if (cache == null) cache = new DocumentListMap();
+            Debug.print("文書一覧並べ替え中...");
+            //res.Sort(byRecency);
+            Debug.print("END: 文書一覧並べ替え中...");
 
             return cache.getRecents();
@@ -155 +161 @@
             return s.search();
         }
-        /*public Document getOldestActiveDocument()
+        public Document getOldestActiveDocument()
         {
             var r = getRecents();
             return r[0];
-        }*/
+        }
 
         /*internal IEnumerable<object> search(SearchCondition condition)

lang/csharp/soyText/soyText/EditorTab.cs

@@ -3 +3 @@
 using System.ComponentModel;
 using System.Drawing;
-using System.Data;
+using System.Data; 
 using System.Linq;
 using System.Text;
@@ -9 +9 @@
 using System.Text.RegularExpressions;
 
-   
+     
 namespace SoyText
 {
@@ -65 +65 @@
         bool listInited = false;
         ListSyncer listSyncer;
-        string listSyncerCondition(string condition)
-        {
-            var syncC = condition;
-            if (syncC == null || syncC == "")
-            {
-                syncC = "-type:SearchLog";
-            }
-            return syncC;
-        }
         public EditorTab(Form2 parent,string condition, bool searchOnLoad)
         {
@@ -89 +80 @@
             inst++;
             defaultInstance = this;
-
-            listSyncer = documentSet.listSyncerSet.add(docListBox, listSyncerCondition(condition));
+            listSyncer = documentSet.listSyncerSet.add(docListBox, condition);
             
             tagSet.onTagFound += delegate(string tag)
@@ -175 +165 @@
                 refreshTagFilters();
             }
-
-            listSyncer.condExpr = listSyncerCondition(condition);
+            
+            listSyncer.condExpr = condition;
             if (titleChanged != null) titleChanged(kw);
             if (documentSearcher != null && !ftSearching) documentSearcher.terminate();
@@ -201 +191 @@
                     {
                         tagSet.add(d);
-                        //Debug.syslog("doc - id=" + d.id); 
                         if (documentSet.searchLogSet.add(d))
                         {
-                            //Debug.syslog("newtab - id=" + d.id+" / "+d.parsed["condition"]+" ft = "+ft+"  closed ="+d.parsed["closed"]);
+                            Debug.syslog("newtab - " + d.parsed["condition"]+" ft = "+ft+"  closed ="+d.parsed["closed"]);
                             if (ft && d.parsed["closed"] != "true")
                             {
@@ -216 +205 @@
                         else
                         {
-                            //Debug.syslog("listSyncer.add - id=" + d.id);
                             cnt++;
                             listSyncer.add(d);
@@ -824 +812 @@
             ExecForm.open(curDoc);
         }
+
         private void docListBox_DragEnter(object sender, DragEventArgs e)
         {
@@ -837 +826 @@
             foreach (var f in s)
             {
-                var d = documentSet.createDocument();
+                var d=documentSet.createDocument();
                 d.str["type"] = "file";
                 d.str["tag"] = "file";

lang/csharp/soyText/soyText/LoggedDocumentSearcher.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
+using System.Text;   
 
 namespace SoyText
@@ -64 +64 @@
 
 
-                var rec = documentSet.getRecents();
-                /*var rec = new DocumentList();
+                var rec0 = documentSet.getRecents();
+                var rec = new DocumentList();
                 lock (rec0)
                 {
                     foreach (var d in rec0) rec.Add(d.Key, d.Value);
-                }*/
-
-                var c = 0;// rec.Count;
+                }
+                
+                var c = rec.Count;
                 var cnt = 0;
                 var found = 0;
@@ -79 +79 @@
                 {
                     checkTimeout(timeOutTime);
-                    var d = dent;//.Value;
+                    var d = dent.Value;
                     if (newestDoc==null) newestDoc=d;
                     oldestDoc=d;

lang/csharp/soyText/soyText/SearchLogSet.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
+using System.Text;    
 
 namespace SoyText
@@ -13 +13 @@
             this.superSet = superSet;
             expr2doc = new Dictionary<string, Document>();
-            recents = new List<Document>();
+            recents = new DocumentList();
         }
         Dictionary<string,Document> expr2doc = null;
-        List<Document> recents;
+        DocumentList recents;
 
         internal bool add(Document d)
@@ -26 +26 @@
             {
                 expr2doc[c] = d;
-                recents.Add(d);
+                recents.add(d);
             }
             else
@@ -34 +34 @@
             return true;
         }
-        internal List<Document> getRecents()
+        internal DocumentList getRecents()
         {
             return recents;

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>WO7NaKrov9ZJeYckPZ/bkERtzPY=</dsig:DigestValue>
+        <dsig:DigestValue>QbKbYGZG9Rv42NJ5HdbgHy312Us=</dsig:DigestValue>
       </hash>
     </dependentAssembly>

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

@@ -114 +114 @@
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="soyText.exe" size="129024">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="soyText.exe" size="133120">
       <assemblyIdentity name="soyText" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
@@ -121 +121 @@
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>dYPQ1A1O7P3dwDWj5Wy78F6mfTM=</dsig:DigestValue>
+        <dsig:DigestValue>s4/FGjF4J8K2w7O1vFRDjCIgxfk=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
-  <file name="soyText.ico" size="1150">
+  <file name="soyText.ico" size="5430">
     <hash>
       <dsig:Transforms>
@@ -131 +131 @@
       </dsig:Transforms>
       <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-      <dsig:DigestValue>vhj8XTvtrUg7dbYknTlxCp11YXc=</dsig:DigestValue>
+      <dsig:DigestValue>fAA37rDzj6wr6z6Bsj7TxnDzcUY=</dsig:DigestValue>
     </hash>
   </file>

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>WO7NaKrov9ZJeYckPZ/bkERtzPY=</dsig:DigestValue>
+        <dsig:DigestValue>QbKbYGZG9Rv42NJ5HdbgHy312Us=</dsig:DigestValue>
       </hash>
     </dependentAssembly>

lang/csharp/soyText/soyText/bin/Release/soyText.application

@@ -5 +5 @@
   <deployment install="true" mapFileExtensions="true" />
   <dependency>
-    <dependentAssembly dependencyType="install" codebase="soyText.exe.manifest" size="7046">
+    <dependentAssembly dependencyType="install" codebase="soyText.exe.manifest" size="7506">
       <assemblyIdentity name="soyText.exe" version="1.0.0.2" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
       <hash>
@@ -12 +12 @@
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>D8FXY2X0SyPowP4MtjnbgPBYw4A=</dsig:DigestValue>
+        <dsig:DigestValue>beohKYxz5iqQyoXCfRTTIMvb+aA=</dsig:DigestValue>
       </hash>
     </dependentAssembly>

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

@@ -2 +2 @@
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1">
   <asmv1:assemblyIdentity name="soyText.exe" version="1.0.0.2" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+  <description asmv2:iconFile="soyText.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <application />
   <entryPoint>
@@ -113 +114 @@
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="soyText.exe" size="104448">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="soyText.exe" size="115200">
       <assemblyIdentity name="soyText" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
@@ -120 +121 @@
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>Rif36i8Fo2qIUJGDoABT5aNp1Lc=</dsig:DigestValue>
+        <dsig:DigestValue>9XmM9u3b7qEvhIzZPefannEyiyA=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
+  <file name="soyText.ico" size="1150">
+    <hash>
+      <dsig:Transforms>
+        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
+      </dsig:Transforms>
+      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+      <dsig:DigestValue>vhj8XTvtrUg7dbYknTlxCp11YXc=</dsig:DigestValue>
+    </hash>
+  </file>
 </asmv1:assembly>