提交: 107 - testroom1 (svn)

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

Commit MetaInfo

• 修订版: 107 (tree)
• 时间: 2014-12-12 02:17:19
• 作者: tuna_p

Log Message

(empty log message)

更改概述

• modified: branches/b3/WebScraping/src/WebScraping/utility/HtmlSearch.java
• modified: branches/b3/WebScraping/src/WebScraping/core/HtmlParser.java

差异

--- branches/b3/WebScraping/src/WebScraping/utility/HtmlSearch.java	(revision 106)
+++ branches/b3/WebScraping/src/WebScraping/utility/HtmlSearch.java	(revision 107)
@@ -385,10 +385,6 @@
         }
     }//GEN-LAST:event_jMenuSaveActionPerformed
 
-    private void jMenu2MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jMenu2MouseClicked
-        Search_execution();
-    }//GEN-LAST:event_jMenu2MouseClicked
-
     private void jBtnRowCpyActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jBtnRowCpyActionPerformed
         int SelectedRow = jTable1.getSelectedRow();
         if(SelectedRow >= 0) {
@@ -398,10 +394,6 @@
         }
     }//GEN-LAST:event_jBtnRowCpyActionPerformed
 
-    private void jBtnSearchActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jBtnSearchActionPerformed
-        Search_execution();
-    }//GEN-LAST:event_jBtnSearchActionPerformed
-
     private void jMenuItem1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItem1ActionPerformed
         Desktop desktop = Desktop.getDesktop();
         String uriString = jTxtUrl.getText();
@@ -414,6 +406,14 @@
         }
     }//GEN-LAST:event_jMenuItem1ActionPerformed
 
+    private void jMenu2MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jMenu2MouseClicked
+        Search_execution();
+    }//GEN-LAST:event_jMenu2MouseClicked
+
+    private void jBtnSearchActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jBtnSearchActionPerformed
+        Search_execution();
+    }//GEN-LAST:event_jBtnSearchActionPerformed
+
     /**
      * 検索実行.
      */
@@ -423,6 +423,10 @@
         
         // データ無し(404)判定
         String strdata = par.getStringPageData();
+        if(strdata == null) {
+            jTxtRtn.append("読込みページがありません");
+            return;
+        }
         String text = jTxt404msg.getText();
         String[] strsearch = text.split("\n");
         for(String strsearch1 : strsearch) {

--- branches/b3/WebScraping/src/WebScraping/core/HtmlParser.java	(revision 106)
+++ branches/b3/WebScraping/src/WebScraping/core/HtmlParser.java	(revision 107)
@@ -210,9 +210,9 @@
      * インターネット接続.
      */
     private void getPageData() {
+        HttpURLConnection con = null;
         try {
-            //URL url = new URL(UrlAdress);
-            HttpURLConnection con = (HttpURLConnection)url.openConnection();
+            con = (HttpURLConnection)url.openConnection();
             con.setRequestMethod("GET");
             BufferedReader reader = new BufferedReader(
                     new InputStreamReader(con.getInputStream(), "utf-8"));
@@ -223,13 +223,17 @@
             }
             pageData = sb.toString();
             
-            con.disconnect();
-        }
-        catch(IOException ex) {
+        } catch(FileNotFoundException ex) {
+            pageData = null;
+        } catch (IOException ex) {
             Logger.getLogger(HtmlParser.class.getName()).log(Level.SEVERE, null, ex);
+        } finally {
+            if(con != null) {
+                con.disconnect();
+            }
         }
     }
-
+    
     /**
      * ＨＴＭＬパーサ.
      * @param skey