package update 1.3.2

Author: smudap

sejmRP/DESCRIPTION

@@ -1,7 +1,7 @@
 Package: sejmRP
 Title: An Information About Deputies and Votings in Polish Diet from seventh to eighth term of office 
-Version: 1.3.1
-Date: 2017-02-15
+Version: 1.3.2
+Date: 2017-02-16
 Authors@R: c(
    person("Piotr","Smuda",email="piotrsmuda@gmail.com",role=c("aut","cre")),
    person("Przemyslaw","Biecek",email="przemyslaw.biecek@gmail.com",role="aut"),

sejmRP/NAMESPACE

@@ -44,4 +44,5 @@ importFrom(dplyr,mutate)
 importFrom(dplyr,sql)
 importFrom(dplyr,src_postgres)
 importFrom(dplyr,tbl)
+importFrom(stringi,stri_length)
 importFrom(xml2,read_html)

sejmRP/R/statements_create_table.R

@@ -26,6 +26,8 @@
 #' @author Piotr Smuda, Tomasz Mikolajczyk
 #'
 #' @export
+#' 
+#' @importFrom stringi stri_length
 #'
 
 statements_create_table <- function(dbname, user, password, host, nr_term_of_office = 8) {
@@ -53,8 +55,15 @@ statements_create_table <- function(dbname, user, password, host, nr_term_of_off
             statements_links <- html_nodes(stenogram, css_pattern)
 
             # move to next day of meeting if empty page found
-            if (length(statements_links) == 0) {
-                break
+            length_statements_links <- length(statements_links)
+            length_of_stenogram <- stri_length(stenogram)
+            if (length_statements_links == 0 && length_of_stenogram <= 30) {
+              break
+            } else if (length_statements_links == 0 && length_of_stenogram > 30) {
+              # none of deputies made a statement
+              # next day of meeting
+              nr_day <- nr_day + 1
+              next
             }
 
             # get titles of order points during a meeting

sejmRP/R/statements_update_table.R

@@ -24,6 +24,8 @@
 #' @author Piotr Smuda, Tomasz Mikolajczyk
 #'
 #' @export
+#' 
+#' @importFrom stringi stri_length
 #'
 
 statements_update_table <- function(dbname, user, password, host, nr_term_of_office = 8, verbose = FALSE) {
@@ -69,8 +71,15 @@ statements_update_table <- function(dbname, user, password, host, nr_term_of_off
             statements_links <- html_nodes(stenogram, css_pattern)
 
             # move to next day of meeting if empty page found
-            if (length(statements_links) == 0) {
-                break
+            length_statements_links <- length(statements_links)
+            length_of_stenogram <- stri_length(stenogram)
+            if (length_statements_links == 0 && length_of_stenogram <= 30) {
+              break
+            } else if (length_statements_links == 0 && length_of_stenogram > 30) {
+              # none of deputies made a statement
+              # next day of meeting
+              nr_day <- nr_day + 1
+              next
             }
 
             # get titles of order points during a meeting