From 693306ba6fb46ca2f24c83f97d8130032fd4e0ea Mon Sep 17 00:00:00 2001
From: Scott R Charlton <charlton@usgs.gov>
Date: Thu, 10 Apr 2014 00:07:21 +0000
Subject: [PATCH] added code to replace non-ascii chars from database files

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8642 1feff8c3-07ed-0310-ac33-dd36852eb9cd
---
 R/Makefile          | 25 ++++++++++++++++---------
 R/build-databases.R | 18 +++++++++---------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/R/Makefile b/R/Makefile
index 2e0e3aa1..ca4ed9e1 100644
--- a/R/Makefile
+++ b/R/Makefile
@@ -10,15 +10,15 @@ EXDIR=../phreeqc3-examples
 MAN=phreeqc/man
 
 DBS = \
-	$(DBDIR)/Amm.dat \
-	$(DBDIR)/iso.dat \
-	$(DBDIR)/llnl.dat \
-	$(DBDIR)/minteq.dat \
-	$(DBDIR)/minteq.v4.dat \
-	$(DBDIR)/pitzer.dat \
-	$(DBDIR)/sit.dat \
-	$(DBDIR)/phreeqc.dat \
-	$(DBDIR)/wateq4f.dat
+	Amm.ascii \
+	iso.ascii \
+	llnl.ascii \
+	minteq.ascii \
+	minteq.v4.ascii \
+	pitzer.ascii \
+	sit.ascii \
+	phreeqc.ascii \
+	wateq4f.ascii
 
 EXS = \
 	$(EXDIR)/ex1 \
@@ -235,6 +235,9 @@ all: $(PSRC) $(XSRC) $(DATA) $(MAN)/phreeqc-package.Rd
 $(DATADIR)/databases.RData : $(DBS) build-databases.R
 	R --no-save --no-restore CMD BATCH build-databases.R
 
+%.ascii : $(DBDIR)/%.dat
+	perl -pe 's/[^[:ascii:]]/?/g' $< > $@
+
 $(DATADIR)/examples.RData : $(EXS) build-examples.R
 	R --no-save --no-restore CMD BATCH build-examples.R
 
@@ -242,9 +245,13 @@ $(DATADIR)/csv.RData : SE_to_export_03142014.csv build-csv.R
 	R --no-save --no-restore CMD BATCH build-csv.R
 
 roxygenize $(MAN)/phreeqc-package.Rd : phreeqc/R/phreeqc.R
+	rm -f $(RDFILES)
 	R --no-save --no-restore CMD BATCH roxygenize.R
 	touch $(MAN)/phreeqc-package.Rd
 
+
+
+
 ##$(PSRC): $(DEST)
 
 ##$(ISRC): $(IDEST)
diff --git a/R/build-databases.R b/R/build-databases.R
index eb3bf4ed..6f3f4c24 100644
--- a/R/build-databases.R
+++ b/R/build-databases.R
@@ -9,14 +9,14 @@
 ##phreeqc.dat.string   <- paste(scan("../database/phreeqc.dat",   what="", sep="\n"), collapse="\n")
 ##wateq4f.dat.string   <- paste(scan("../database/wateq4f.dat",   what="", sep="\n"), collapse="\n")
 # lists
-Amm.dat         <- scan("../database/Amm.dat",       what="", sep="\n")
-iso.dat         <- scan("../database/iso.dat",       what="", sep="\n")
-llnl.dat        <- scan("../database/llnl.dat",      what="", sep="\n")
-minteq.dat      <- scan("../database/minteq.dat",    what="", sep="\n")
-minteq.v4.dat   <- scan("../database/minteq.v4.dat", what="", sep="\n")
-pitzer.dat      <- scan("../database/pitzer.dat",    what="", sep="\n")
-sit.dat         <- scan("../database/sit.dat",       what="", sep="\n")
-phreeqc.dat     <- scan("../database/phreeqc.dat",   what="", sep="\n")
-wateq4f.dat     <- scan("../database/wateq4f.dat",   what="", sep="\n")
+Amm.dat         <- scan("Amm.ascii",       what="", sep="\n")
+iso.dat         <- scan("iso.ascii",       what="", sep="\n")
+llnl.dat        <- scan("llnl.ascii",      what="", sep="\n")
+minteq.dat      <- scan("minteq.ascii",    what="", sep="\n")
+minteq.v4.dat   <- scan("minteq.v4.ascii", what="", sep="\n")
+pitzer.dat      <- scan("pitzer.ascii",    what="", sep="\n")
+sit.dat         <- scan("sit.ascii",       what="", sep="\n")
+phreeqc.dat     <- scan("phreeqc.ascii",   what="", sep="\n")
+wateq4f.dat     <- scan("wateq4f.ascii",   what="", sep="\n")
 save(list = ls(all=TRUE), file="phreeqc/data/databases.RData")
 rm(list = ls(all=TRUE))