• R/O
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

作業部屋の使い方を試しています。


Commit MetaInfo

Revision77 (tree)
Time2014-08-19 20:58:38
Authortuna_p

Log Message

(empty log message)

Change Summary

Incremental Difference

--- trunk/HtmlTest2/src/Form/HtmlSearch.java (revision 76)
+++ trunk/HtmlTest2/src/Form/HtmlSearch.java (revision 77)
@@ -332,8 +332,10 @@
332332 jTxtRtn.setText(null);
333333 HtmlParser par = new HtmlParser(jTxtUrl.getText());
334334 for (Object slist1 : slist) {
335- String rtn = par.search((SearchData)slist1);
336- jTxtRtn.append(rtn + "\r\n");
335+ SearchData sdata = (SearchData)slist1;
336+ String ans = sdata.getitem();
337+ String rtn = par.search(sdata);
338+ jTxtRtn.append(ans + "\t" + rtn + "\r\n");
337339 }
338340 jTxtRtn.setCaretPosition(0);
339341 }//GEN-LAST:event_jMenu2MouseClicked
@@ -351,8 +353,10 @@
351353 jTxtRtn.setText(null);
352354 HtmlParser par = new HtmlParser(jTxtUrl.getText());
353355 for (Object slist1 : slist) {
354- String rtn = par.search((SearchData)slist1);
355- jTxtRtn.append(rtn + "\r\n");
356+ SearchData sdata = (SearchData)slist1;
357+ String ans = sdata.getitem();
358+ String rtn = par.search(sdata);
359+ jTxtRtn.append(ans + "\t" + rtn + "\r\n");
356360 }
357361 jTxtRtn.setCaretPosition(0);
358362 }//GEN-LAST:event_jBtnSearchActionPerformed
--- trunk/HtmlTest2/src/WebScraping/HtmlParser.java (revision 76)
+++ trunk/HtmlTest2/src/WebScraping/HtmlParser.java (revision 77)
@@ -25,6 +25,8 @@
2525 import java.io.*;
2626 import java.net.*;
2727 import java.util.ArrayList;
28+import java.util.logging.Level;
29+import java.util.logging.Logger;
2830 import java.util.regex.Matcher;
2931 import java.util.regex.Pattern;
3032 import javax.swing.text.html.parser.ParserDelegator;
@@ -35,7 +37,7 @@
3537 */
3638 public class HtmlParser {
3739
38- String UrlAdress;
40+ URL url;
3941 String pageData;
4042
4143 ArrayList sData;
@@ -46,17 +48,37 @@
4648 String htmlclass;
4749
4850 public HtmlParser() {
49- UrlAdress = null;
51+ url = null;
5052 }
5153
54+ public HtmlParser(URL UrlAdress) {
55+ this.url = UrlAdress;
56+ getpageData();
57+ }
58+
5259 public HtmlParser(String UrlAdress) {
53- this.UrlAdress = UrlAdress;
60+ try {
61+ url = new URL(UrlAdress);
62+ getpageData();
63+
64+ } catch (MalformedURLException ex) {
65+ Logger.getLogger(HtmlParser.class.getName()).log(Level.SEVERE, null, ex);
66+ }
67+ }
68+
69+ public void seturl(URL UrlAdress) {
70+ this.url = UrlAdress;
5471 getpageData();
5572 }
5673
5774 public void seturl(String UrlAdress) {
58- this.UrlAdress = UrlAdress;
59- getpageData();
75+ try {
76+ url = new URL(UrlAdress);
77+ getpageData();
78+
79+ } catch (MalformedURLException ex) {
80+ Logger.getLogger(HtmlParser.class.getName()).log(Level.SEVERE, null, ex);
81+ }
6082 }
6183
6284 /**
@@ -72,9 +94,6 @@
7294 */
7395 public String search(SearchData skey) {
7496
75- String item = skey.getitem();
76- String regexp = skey.getregexp();
77-
7897 // htmlページ内を検索
7998 if(isHtmlkeyEq(skey) == false) {
8099 serchpageData(skey);
@@ -83,14 +102,13 @@
83102 around 出現位置指定 入力有り:指定された位置の情報のみ返す。
84103 入力無し:取得した全ての情報を返す。
85104 */
86- String wkaround = skey.getaround();
87- if(wkaround.length() > 0) {
88- byte wbAround = 0;
89- wbAround = Byte.parseByte(wkaround); // 検索位置を数値変換
90- if(wbAround < sData.size()) {
91- String str = (String)sData.get(wbAround);
105+ String regexp = skey.getregexp();
106+ if(skey.getaround().length() > 0) {
107+ int wkAround = Integer.parseInt(skey.getaround()); // 検索位置を数値変換
108+ if(wkAround < sData.size()) {
109+ String str = (String)sData.get(wkAround);
92110 String rtn = RegularExpression(str, regexp);
93- return item + "\t" + rtn;
111+ return rtn;
94112 }
95113 } else {
96114 StringBuilder strbuf = new StringBuilder();
@@ -102,7 +120,7 @@
102120 }
103121 strbuf.append(rtn);
104122 }
105- return item + "\t" + strbuf;
123+ return strbuf.toString();
106124 }
107125 return null;
108126 }
@@ -187,7 +205,7 @@
187205 */
188206 private void getpageData() {
189207 try {
190- URL url = new URL(UrlAdress);
208+ //URL url = new URL(UrlAdress);
191209 HttpURLConnection con = (HttpURLConnection)url.openConnection();
192210 con.setRequestMethod("GET");
193211 BufferedReader reader = new BufferedReader(