新しい検索ページフォームに対応

git-svn-id: http://192.168.11.7/svn/repository/NicoBrowser/trunk@442 bdf3b611-c98c-6041-8292-703d9c9adbe7

diff --git a/src/nicobrowser/util/ResultParse.groovy b/src/nicobrowser/util/ResultParse.groovy
index 79b3d03..2f2a64a 100644 (file)
--- a/src/nicobrowser/util/ResultParse.groovy
+++ b/src/nicobrowser/util/ResultParse.groovy
@@ -7,7 +7,7 @@ import org.cyberneko.html.parsers.SAXParser
 class ResultParse {
     List<nicobrowser.util.Result> parse(InputStream is){
         def html = new XmlSlurper(new SAXParser()).parse(is)
-        def res = html.'**'.findAll{it.@class == 'vinfo_title'}
+        def res = html.'**'.find{it.@id == 'PAGEBODY'}.DIV.DIV.DIV.DIV.TABLE.TBODY.TR.TD.DIV.P.NOBR.A
 
         List<nicobrowser.util.Result> list = []
         res.each{list += new nicobrowser.util.Result(

diff --git a/test/nicobrowser/NicoHttpClientTest.java b/test/nicobrowser/NicoHttpClientTest.java
index b01a0b9..2ba4809 100644 (file)
--- a/test/nicobrowser/NicoHttpClientTest.java
+++ b/test/nicobrowser/NicoHttpClientTest.java
@@ -231,7 +231,7 @@ public class NicoHttpClientTest {
         SearchResult result = instance.search(SearchKind.KeyWord, "初音ミク", SortKind.PlayTimes, SortOrder.Descending, 1);
         ArrayList<NicoContent> conts = result.getContents();
         System.out.println("検索結果件数： " + conts.size());
-        assertEquals("1ページの上限20件がヒット", 20, conts.size());
+        assertEquals("1ページの上限32件がヒット", 32, conts.size());
         assertTrue(result.getPages().size() > 0);
     }