Commit: 135 - testroom1 (svn)

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

Commit MetaInfo

• Revision: 135 (tree)
• Time: 2016-05-05 14:38:55
• Author: tuna_p

Log Message

結果返却方法改良

Change Summary

• modified: branches/b4/webScraping/src/WebScraping/utility/HtmlSearch.java
• added: branches/b4/webScraping/src/WebScraping/core/Scraping.java

Incremental Difference

--- branches/b4/webScraping/src/WebScraping/utility/HtmlSearch.java	(revision 134)
+++ branches/b4/webScraping/src/WebScraping/utility/HtmlSearch.java	(revision 135)
@@ -21,13 +21,16 @@
  */
 package webScraping.utility;
 
+import WebScraping.core.Scraping;
 import webScraping.core.HtmlParser;
 import webScraping.core.SearchData;
 import java.awt.Desktop;
 import java.io.File;
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.JFileChooser;
@@ -391,7 +394,7 @@
     /**
      * 検索実行.
      */
-    void Search_execution() {
+    void Search_execution_old() {
         jTxtRtn.setText(null);
         HtmlParser par = new HtmlParser(jTxtUrl.getText());
         
@@ -422,6 +425,43 @@
     }
     
     /**
+     * 検索実行.
+     */
+    void Search_execution() {
+        jTxtRtn.setText(null);
+        Scraping scrap = new Scraping();
+        
+        URL url = null;
+        try {
+            url = new URL(jTxtUrl.getText());
+        } catch (MalformedURLException ex) {
+            Logger.getLogger(HtmlSearch.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        
+        SearchData[] skey = new SearchData[sdatatblmodel.getRowCount()];
+        for(int row = 0; row < sdatatblmodel.getRowCount(); row++) {
+            skey[row] = sdatatblmodel.getSearchData(row);
+        }
+        
+        // ＨＴＭＬ検索
+        String[] result = scrap.getResult(url, skey);
+        
+        // 検索結果
+        if(result == null) {
+            jTxtRtn.append("Data not find");
+            return;
+        }
+        
+        for(int i = 0; i < skey.length; i++) {
+            String ans = skey[i].getitem();
+            String rtn = result[i];
+            jTxtRtn.append(ans + "\t" + rtn + "\n");
+        }
+        
+        jTxtRtn.setCaretPosition(0);
+    }
+    
+    /**
      * @param args the command line arguments
      */
     public static void main(String args[]) {

--- branches/b4/webScraping/src/WebScraping/core/Scraping.java	(nonexistent)
+++ branches/b4/webScraping/src/WebScraping/core/Scraping.java	(revision 135)
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2016 kgto.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+/*
+ * $Id: $
+ */
+package WebScraping.core;
+
+import java.net.URL;
+import webScraping.core.HtmlParser;
+import webScraping.core.SearchData;
+
+/**
+ *
+ * @author kgto
+ */
+public class Scraping {
+
+    /**
+     * ＨＴＭＬ解析.
+     * @param url
+     * @param skey
+     * @return 
+     */
+    public String[] getResult(URL url, SearchData[] skey) {
+        
+        HtmlParser par = new HtmlParser(url);
+        
+        String[] result = new String[skey.length];
+        for(int i = 0; i < skey.length; i++) {
+            result[i] = par.search(skey[i]);
+        }
+        
+        if(!resultCheck(result)) {
+            return null;
+        }
+        return result;
+    }
+    
+    /**
+     * 結果文字列チェック.
+     * @param result
+     * @return 文字列配列に１文字でも入力有り(null/SPACE以外)の時、true
+     */
+    boolean resultCheck(String[] result) {
+        for(int i = 0; i < result.length; i++) {
+            String str = "";
+            if(result[i] != null) {
+                str = result[i].trim();
+            }
+            
+            if(str.length() > 0)  {
+                return true;
+            }
+        }
+        return false;
+    }
+    
+}