From 0d958ab6f84b569b5437f231c56004890c4ae23b Mon Sep 17 00:00:00 2001
From: Johannes Ranke <jranke@uni-bremen.de>
Date: Tue, 27 Sep 2016 17:50:34 +0200
Subject: Make the chents package optional

---
 GNUmakefile      | 4 ----
 pkg/DESCRIPTION  | 8 ++++----
 pkg/R/endpoint.R | 3 +++
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 8e505af..d6a2dd3 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -40,10 +40,6 @@ sd: roxygen
 	@echo "Building static documentation..."
 	# suppressWarnings to get rid of mbcsToSbcs warnings when plotting the 'µ' character
 	cd pkg; "$(R_HOME)/bin/Rscript" -e 'suppressWarnings(staticdocs::build_site())'
-	# The following workaround (setting the pdf encoding) as of stackoverflow 13251665 did not do it
-	#cd pkg; "$(R_HOME)/bin/Rscript" -e 'pdf.options(encoding="ISOLatin1.enc"); staticdocs::build_site()'
-	# The following also does not work (Konvertierungsfehler)
-	#cd pkg; "$(R_HOME)/bin/Rscript" -e 'options(encoding="latin1"); staticdocs::build_site()'
 	@echo "DONE."
 
 $(TGZ): $(pkgfiles)
diff --git a/pkg/DESCRIPTION b/pkg/DESCRIPTION
index 0d7f5bc..f9de23c 100644
--- a/pkg/DESCRIPTION
+++ b/pkg/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: pfm
 Type: Package
 Title: Utilities for Pesticide Fate Modelling
-Version: 0.3-7
-Date: 2016-07-30
+Version: 0.3-8
+Date: 2016-09-26
 Authors@R: person("Johannes Ranke", email = "jranke@uni-bremen.de", 
                   role = c("aut", "cre", "cph"))
 Description: Utilities for simple calculations of predicted environmental
@@ -13,11 +13,11 @@ Depends:
     mkin
 Imports:
     graphics,
-    chents,
     readr,
     methods
 Suggests:
-    testthat
+    testthat,
+    chents
 License: GPL
 LazyLoad: yes
 LazyData: yes
diff --git a/pkg/R/endpoint.R b/pkg/R/endpoint.R
index 68e47f7..314acd2 100644
--- a/pkg/R/endpoint.R
+++ b/pkg/R/endpoint.R
@@ -41,6 +41,9 @@ endpoint <- function(chent,
                      raw = FALSE,
                      signif = 3)
 {
+  if (!is(chent, "chent")) {
+    stop("Please supply a chent object as created using the package 'chents' available from jrwb.de")
+  }
   ep_list <- chent$chyaml[[medium]][[type]] 
   if (!is.na(lab_field[1])) {
     ep_list <- ep_list[[lab_field]]
-- 
cgit v1.2.1