Changeset 36512 for lang/csharp

Timestamp:

01/22/10 17:34:09 (3 years ago)

Author:

hoge1e3

Message:

 

Location:

lang/csharp/soyText/soyText

Files:

• DocumentSet.cs (modified) (1 diff)
• DocumentWebServer.cs (modified) (2 diffs)
• SearchLogSet.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)
• bin/Debug/soyText.vshost.exe (modified) (previous)

lang/csharp/soyText/soyText/DocumentSet.cs

@@ -68 +68 @@
         public DocumentList getRecents()
         {
+            if (cache != null) return cache.getRecents();
             Debug.syslog("Getrecent called " + (++count) + "times");
-            if (cache != null) return cache.getRecents();
             Debug.print("文書一覧取得中...");
             //var res = new DocumentList();

lang/csharp/soyText/soyText/DocumentWebServer.cs

@@ -30 +30 @@
                 Debug.syslog(str);
                 var s=Regex.Split(str, @"/");
-                
-                
+                if (req.RemoteEndPoint.Address.ToString()!="127.0.0.1")
+                {
+                    res.StatusCode = 403;
+                    Httpd.respondByString(res, "isLocal "+req.IsLocal+" / "+req.RemoteEndPoint.Address);
+                    return;
+                }
                 if (s[1].ToLower()=="byid" && s.Length>=2)
                 {
@@ -49 +53 @@
                 else
                 {
-                    var c = new AndCondition();
+                    //var c = new AndCondition();
+                    var cstr = "";
                     for (var i = 1; i < s.Length - 1; i++)
                     {
-                        c.add(new AttributeCondition("tag",s[i]));
+                        if (i>1) cstr += " ";
+                        cstr += "tag:" + s[i];
+                        // c.add(new AttributeCondition("tag",s[i]));
                     }
-                    c.add(new AttributeCondition("name",s[s.Length-1]));
-                    var src=documentSet.createDocumentSearcher(c);
-                    Document found=null;
-                    foreach (var d in src.search()) {
-                        found=d;
-                        break;
+                    var name=s[s.Length - 1];
+                    if (name == "")
+                    {
+                        search(cstr, res);
                     }
-                    if (found!=null) {
-                        feedDocument(found, res);
-                    } else {
-                        res.StatusCode = 404;
-                        Httpd.respondByString(res, "Not found : "+str);
+                    else
+                    {
+                        var nc = new AttributeCondition("name", name);
+                        //c.add();
+                        //var src=documentSet.createDocumentSearcher(c);
+                        Document found = null;
+                        foreach (var d in documentSet.search(cstr, true))
+                        {
+                            if (nc.matches(d))
+                            {
+                                found = d;
+                                break;
+                            }
+                        }
+                        if (found != null)
+                        {
+                            feedDocument(found, res);
+                        }
+                        else
+                        {
+                            res.StatusCode = 404;
+                            Httpd.respondByString(res, "Not found : " + str);
+                        }
                     }
                 }
             });
         }
+
+        private void search(string cstr, HttpListenerResponse res)
+        {
+            var buf = "";
+            foreach (var d in documentSet.search(cstr, true))
+            {
+                buf += "<a href=\"/byid/" + d.id + "\">" + d.ToString() + "</a><br/>\n";
+
+            }
+            res.ContentType = "text/html; charset=utf-8";
+            Httpd.respondByString(res, buf);
+        }
     }
 }

lang/csharp/soyText/soyText/SearchLogSet.cs

@@ -53 +53 @@
                 d.save();
                 add(d);
+                Debug.syslog("searchLogSet.addOrGet: new " + searchExpr);
                 return d;
             }
+            Debug.syslog("searchLogSet.addOrGet: using "+expr2doc[c].id +" for "+ searchExpr);
             return expr2doc[c];
         }

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>/HIo/Q3Fs9gZgg2VhJ/f0NTzC0c=</dsig:DigestValue>
+        <dsig:DigestValue>MNlBnwvOKvpJMUxLlXER2Q3vpQM=</dsig:DigestValue>
       </hash>
     </dependentAssembly>

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

@@ -113 +113 @@
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="soyText.exe" size="119296">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="soyText.exe" size="120320">
       <assemblyIdentity name="soyText" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
@@ -120 +120 @@
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>YMToFiphbNRH3JvmM9mUijtDw30=</dsig:DigestValue>
+        <dsig:DigestValue>Jd6quLTYL9ZUU3sUYExy+6fDENM=</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>/HIo/Q3Fs9gZgg2VhJ/f0NTzC0c=</dsig:DigestValue>
+        <dsig:DigestValue>MNlBnwvOKvpJMUxLlXER2Q3vpQM=</dsig:DigestValue>
       </hash>
     </dependentAssembly>