From 419d104bf7a3a8469bbd1cc3d8e2d30e677ad48f Mon Sep 17 00:00:00 2001
From: Marina Kiweler <marina.kiweler@mpi-bn.mpg.de>
Date: Mon, 11 Feb 2019 16:10:58 +0100
Subject: [PATCH] replace - and unmute c#

---
 R/load_meta_functions.R     |   6 ++++--
 R/sysdata.rda               | Bin 0 -> 2735 bytes
 R/term_matching_functions.R |   2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 R/sysdata.rda

diff --git a/R/load_meta_functions.R b/R/load_meta_functions.R
index 7741bf8..879bcdc 100644
--- a/R/load_meta_functions.R
+++ b/R/load_meta_functions.R
@@ -1,6 +1,7 @@
 #' create a JSON File
 #'
 #' @param path_data Path to raw file or directory containing raw files.
+#' @param silent Error and informational output is hidden if FALSE.
 #'
 #' @return JSON object containing the meta data of the raw files.
 #'
@@ -20,7 +21,7 @@
 #'  }
 #' @export
 
-generate_json <- function(path_data)
+generate_json <- function(path_data, silent = FALSE)
 {
   new_file <- tempfile()
   path_MARMoSET_exe <- system.file(
@@ -34,6 +35,7 @@ generate_json <- function(path_data)
                                  msg = "path_data is not a file or directory!",
                                  severity = "stop",
                                  what = "any")
+  assertive.types::assert_is_a_bool(silent)
 
   if(!assertive.reflection::is_windows())
   {
@@ -41,7 +43,7 @@ generate_json <- function(path_data)
   }
 
   system(command = paste(path_MARMoSET_exe, paste0('"',path_data, '"'), new_file),
-         intern  = T)
+          show.output.on.console = !silent)
 
   json <- jsonlite::fromJSON(new_file)
 
diff --git a/R/sysdata.rda b/R/sysdata.rda
new file mode 100644
index 0000000000000000000000000000000000000000..ba1d347b194bae9c0742a3d52e55aad5e59c0024
GIT binary patch
literal 2735
zcmV;g3Q+YzT4*^jL0KkKS)`aT?En+w|Ly<(|Nqwi|Nk%l|LVX0|L{Nn0ss;K5C9MW
z00H0*KYc&|`3(R707QrdK_LoMK&llgLx2DP8UO$QXaS%A8UO%j0000u0004?000Jn
z8UO*H00w{n00V#k02%-Q0B8ZA02%-QXaE2JGt~c8P&Cs+OpO^DFpV?=BS2^vBSwsw
z0|;UoWCIff5hx;P6BNman?aB&dsE3ZJvN#n#YgI&s(PNMp|wxcnLQ_@!K1`w5YzPp
z3RIIonj=gSpOS4%kba>Vsix9sHlx%%L8CwbX`lcN9+1=ZJf~Ti#BZ(*Mn%G6u3bCZ
zGov#zC_#vdeMTp}3Wz2ixKIIwAtODTXR21we>?bEEL!1B$ifq6)&0j__-@4<VOO73
zYQrAx^>brNm27d?3|Jtle2>P{>3{oHUp;GD*0rvVcmB_d_*%A>wX11cXGGNyWC6@K
zY~s=5bPb$1!^rs^k65GaYUu+eu9rZ^Slm6wq%lMPA1k)+nwPu6)z<T!k?Od;76^25
zqp6Hw#tayQViD*yDVmTbrrQGa%S&`35sVlSj8;FyDWQ$WbAh?e-H!XO^vg9JO&u(K
ztm|S>lJ~gL3bk`P!B(M1TkLEYJI%7(`flfauLF)fM-1+^{d%tO#xP((h(<=NXl|g<
z!O5!?qphR4h*gMT0o4XmH7e5_W^C52rL9WJ*V#-r>-w}_`S8Nlz7qIWr6r!Q3L2FJ
zNU9=1d(=_ph$yFW0u+La-WY%=NHQrS5&;4%0um7<83=+tne;^vZE&Ip8wWT$`d*kT
zXKDQ1_U*a1=|BJg0000000005MHK)Q1wa54000008KvroiK3k;T`ts0>41YWW2=qx
zw?h^?A3!2+I^6GJ(BkcIbiEfllatb5$Cbt4bB<Ud(Ww4G&r#gs1EdhB=3*L{>T}WD
z{cmNX7>E%FgldV74{EM1YCU)T!4n5#XKo_8nCo{u=QCs}Yc1Tv2-vf=6=t<rF2cck
zt5Vr^aBvyC;xwr19wA+$!+1kmR|bq~`>1`^A(N?$Y}9xgJm>Pat9MJhIoiJKxNv%}
zD*$}T5MUs35Pwkq*QD{imw}991_KzugBXRK&WC4lbc6YaOGk;^{Vh<iB4qq6U5+5H
z@p#Ah2MGF2Bam)r{)U5Rf#!M)LrZ1|Z{4$D-Uc-Rv;b(vS?#d_DAmFPMmV-A^zH!I
zIk&+MgP?hZcZ91S0|$|h-*&ZX^d9?W!QpXmYz<!X!s!o@*2gD+2Pc{ExHo$4XNU*k
z$xzt-H@5g44T1RHpzC}Nmr4uw9((h)cDOcZIZ?I^9x>r;;@#HO=)2Bljcm|pHxzpc
z3qUjsABZ?mtMG^J82<6^c7kS1Tv*0&`Tydgd!ycH;(fFogB+X(-m8J{kLPMW79z+C
z2%~ovfb2!Yt4fU+0Q^Bg4?x{5ki=YSACJv@yxljlIIvd3`Jy@l_ILdW{(L*UGu74T
zb#h_TpJx`_eh*LEbk&<rUTD|r_2kE9-)0@|3-cz8d>W>mI`c8}@b~Y>;P!N$lLbNy
z9+;Wml+?nh#NBp^)O!_SAF=Da%zMx8d(O6x*!rH^>U>WF`=2Z2eJ{rSui$=HW3kZv
z57zqIJMK@+)%}kP&`=nv*#M)!!MMf>1Q;-1Gu3bk+mZ7HT6Wq$I{_1_***8<Y=&kk
z-ZXbK0sJHOSQnNk`5=!u^m<G%!|T>L+=c`2Dj;~rh*tg(z5xVa!HiX4!HjS~KH%Sl
zus=ozs0vhU*`vlW3_I+gpECr!L*@Sq@eh<Q`SWGx`o9ZqXMv~H_^}!uVMdK26{94F
zx1x!aqe+#Q<ug<CN}BAW6k3)F@vTc$?JWhF_6(U=t6{|6*?RY{Z+nAk_H9*VLh{jC
ztdD7Dao*W%SYjK2{_*1wsWgvVcRT^eJyC-MyH_F5pr56n!P+z$Il-d`0N6Di>MP_a
za29oRu~BU%!S>fZ&sKM95xVW$R-vEf?ke+^tHZr&M<(nqa#X=4><h7CX~j8_h{0BB
z8jTBibslZMc7PiS;)YMPj2a6>7c-@}=L6XlF64(8YYvMB2Ed?yHqC(vwU4E!&?wcV
zUN-D#gI4WXStO%I?a^%PV}nMhy=%Fui+2YX7CD?RR}rt3`B>%@b&h8{fOv<I<M6)K
z$-xK$8GvEad0t0(wW`(B;5B1Wd<+z5#_wc!gShQv$?lK)JvTBKyh4Ehh$*tK0PJY(
z9wDPaqy58BTMnSZP&NYK$6Ize&v48)aTH^^?XO8>uvlB=tzyN6v2&<(BTd7&d_mS8
zq7`|E#`D0S-RQin2R$CZRraBR-nTOI)+|`IE;z)SiJcZMX0ue7vQpAro3|9%`w!G|
zuT^TfI(4sxUxMCH^DI$Y-tV#E^)a5CfZsdRS7CXpoM>D2BTsrVSiBon6tR2PG2XWf
z#)$OJt0Q&3zw3fE$1?QSO6NXm?5tdBS=!OL=RAT&y4W#@Mhrp&7{&q+8oaGgtMEO6
zjT(=4@I2wt4kM+>%<&DtD=U(Pi<Mzw+zWYcTT5Mv|B78pqvY8Yfu$KNuYb>s<4#EK
zY{JUH=q?i(GCYfIo_otemeS_-Xr2PJ-f}iZ;c!N4Dd?)vC&aWW%(+cvS{Sbotw4`G
zje_BmglH6^5PE=y^F=7EK}#jx1qGtM<Ix+YfOh!a7ei2pW?BZJf(|1P6Zt=t?mmam
z(f8lPKJ!=k4lP?g^W$=A`5$X%+WjtPLz(kBU&zN(@i@O0@Au20cf3{$L5tMEdKOtE
zJGL(E^vsn<%swyl<yWlUa)khZX;!1!a%}flH$iYh2vLI@E9PFs0lKzA?c_yBSq+vE
zX;`a8n#gF3MKHMT8g&fs&%8eW-xLasm=Z924?V<jd}v1?`_F}RS)+C8-WbmEUPX*F
zXQ@`?<Ub99uEmR$1_Hvw9xImduGL(_UF<Ew?NMH_c@Md1?3aw@vW<nsZY>zPW6Yzm
zfQcSR(e1rO1m#+S5eS1DFlZ?9D2GYyxef!_93EI4F%A{MaC9-j`Gp<BrGr#G%Z(U8
z*v2quF^Vu4pt{8#$D)6T1IFMB19{x-dP)O`U^y$C9^#@@GY*l1&;f(W)!=+jiHvUJ
z6kt08Q1zW5bS?z~1DtdY+i|kYu^r7tz%EG4DZLr;<DBl?*~ukddyzm}I7aO%gBr22
zjA}L>c$;XNAvEGmDp;vHIc_4(!M^PwQO@c^BsH;!L@eU!Ljlq}z~VRx<^iiwjwn&i
z0T#m)67KVzvz!EQ2<O3~MPnF>L7>q!(LpRJ+CwvOk43vxZVx+=supq`Ail8r0?x>%
zE#I}MaM4^BOm2rFI~rEo3J69qpwJo&LJS%@m?D}U#!bVLI&50#Us}^_RBRH$-4x(P
z)$pp=jdwws%I1zM3*X60ypDpdh(Ws*)eusxN)N{A>W=6B`$NP#?tmQQE*dKexPfsF
zJG*0aw$;gUtrlx&{nS*TKw!opk`)>}4rDn>GR)r^4Mxov??=u&h*2H(FmZ5pgZdTX
p8CL~dMc_Xeoon7*Xmvr?<yx0q%Jglffb^^27ji{7P>`gUG3{_;9UlMy

literal 0
HcmV?d00001

diff --git a/R/term_matching_functions.R b/R/term_matching_functions.R
index ac8fa5b..61681f1 100644
--- a/R/term_matching_functions.R
+++ b/R/term_matching_functions.R
@@ -85,7 +85,7 @@ one_group_match_terms <- function(flat_json, term_matching_table, group_number)
     }
   }
 
-  meta_data_table %<>% dplyr::mutate(Value = Value %>% stringi::stri_replace_first_fixed('―','-'))
+  meta_data_table %<>% dplyr::mutate(Value = Value %>% stringi::stri_replace_first_fixed('\U2015','-'))
 
   return(meta_data_table)
 }