diff --git a/CKAN_JRO-master.tar.gz b/CKAN_JRO-master.tar.gz index 9553caa824dccc9526285170959b140acf3d81f2..8aa8cce56e4bae1fbff4cc815a2837edad505e4e 100644 GIT binary patch delta 7227 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 J8?gZJ005kAKe7M- delta 7158 zc$@+D8wup)IF>jEABzYGs-WtT2P1!#qIhl7TD){?+L`vmO2^&ta=qNXeLXG~EkQOr z6v=Rj?M|g?eq+94K47Y5{$##n&H=c9tEk0x(jhAqizIMxaBy~jfU==%{CJ|>zopuU zIximOYV)h;Z@b;wjDO?vPG@tg`-0rRc!JA!J-8^tN9xa~$LkZ#^{BJ)Sn|KKvxR>Z#$z4nEY?G zJM9-_>nY{mwQS4rXkoc&@4r&{S8DxV>;GE+*ZM!u|Ka_{lI4Fk{lDGqZP)t$o6-N> z?X3Rq)%yQQ^nW+0|F^n5rCon({#yV4?pUg3>x%vGxca}->Fn%ulJehecQ--*x1Un} zzft`^cB}~*zSm3`YobrEkK~k2ERP~5G*-m-3UwUIal>Lqmbd47x0a*-K}TzN`^NH3 z`1NNhWjzzebcmW3JL*P)`ScyEr&II6pW(BPXYWzr)|Sxpi`)xfbd4$vFew zv~`rrDxpjAUQ`wqQG#cRYVr-!Dk?G}E?ahEquOd3VEIyn` zE{^xrE~@CPtqC*^%GM@yV6Q{Nixw~@`E-UQrA^YZ9-r5GelPug}4?7vSm|; zL1?)$K8>;JCTk@ClHD|dRdH*~hDD}j1$j;x8kS32awvb}C&#Dfd#7aY-A@-sAm+!w zB!_!3`up^n5^8?bK`?z2#1RxC2qd8orf&GQ|D%3mD>v4)VpAAL&V#g(065M&;?C)tvdwNl%Csx6lq<2B+t zMtY!*ER)J{7kv%JS&F=-j?y8mRcRGeSPLr4tCB3m?7|BlT7T$3zKt!VO-TrPsgc-o}4cZ%65Elh!Y9&kx_N5kr4Z$xn3n z-jd1dTd*&5qxZeiR=S;?j`IB$In&0PqX)HOM6h#=NdTSL*tb}3L07$}54(v@10h`M zsM-yT<*u*A47xHaBsqyg;vIlU+($+Aab)ThF#llOTQb=NO8%+?58k;_QVJPlm!gFP z!-szq|M!27`%Vp)PAk75HBz*?_09LH3yu!F?tpiid~JXYh8LGt$;Tsoh>t&gPCf?S zz(&%;aSOwU&{K~s6JfL)0*j)oIRTFftmsg1UQAXkQTkqB=)Y>tjVsiN#xJQZuqL+} zK|Ov0_5b?*E(IbKp8|h{Jr2Z=IW55Y6HtFLD3>mCL&!*XZOcSYFKPLr8&)dUxZ(Bs z_~`879VoXxY5sI^ut)X>oa;QpEvJdxlfC}TO794qU|i@e@D8}!M^9tg=#faGBB^z~bkDzqZ#-5SAe=$;%W*U#kTAgD=8O_ zOQkCw7teV}VjoD}4cJ8w6n`vKq1b=$zj7-QpI9B;52>9Zn!1LM)sLFt(>0<(he7Kp z_((U$R!h!nJE{vh6XN-st$n~K2|Z134UUz68!WYY?>?XlAyS%h`Z~f zjR%*)H}xTS6u_AJNBEnJO)yqDJ^oqAm;aN!)4jvN`RVc5GPJ$^NWAey)s20 z5-uj0ApfAnQT8Lc6}&>~7Q8|dXJ1v6eyplHhN*MCzo|pYzcD+%E+JCZU&NEvB&8y zTcG5C%@o~b>>BZ%oU5gzH}IY`U%E|J8QcTclgLXV)N5phAS5pOV45dILyXU_iujf7#8mA#n-CwHz;{3`6$waY*B$h4D?w z3j1<#gd-5}GNj&>qJhmaM=fS8{J=`c)nIV(2_Ym*htEw$KA?Xr)0I06Ba6Bzufb13 z&W9L68l0XUpZ5F0h~p5_iS0c!MNudiYtT@cp^nKu(jBov!FXHFh@x|HIpzT@jxNAJ zTv7mX1~t5m+?vR|$?{c6dqw<(nXRZ${y-p-IDiosmXxi=TZNrqe6k4RX*tJVY;1i1Mc z&_^~!wT3JuEtYf0YQe}MrS~3?JehUmE<`r%h&;q{JZljvQPZE`d;-c?W;|1}!|i`y z)IT+`OtVk8Bif9d40t3sdCi2058vVM&jql-A;PLH!LfhMGwoss5?Ai$sctA%6ooKO zEeJpa8^VDUgdj=u6LARtnIDDZjAE>~Lug5i;&DZhMk=Xl2*Op>b!ioOuEnihb~M-7 z*vn*9Qq@o+0Fo^}g1HLgl2y5q8_VY3Obmt-=gP&!!F~(75WBq?Ac1>=Q!blwie*Bl z5_BPRrg49ioB9a2tSJ#r3jq*3kwojlq9k0T;PaIQ{VLD{rmp~hNrbY&jrUqo^V8=h z;psaW*vbcyfAuPe#K6y&6wYdeV=pN3obcC$;3Ev1`7D5D7;2CN&oF%C&O7v@?t z&BbH)L_Ad(!cPg^*&qeKQGtiQ>)<_2$C-n6_6~i8k|;hV|BMymv6`{sY$@n@!@?YU zo)>>O3s6H3;Zs-#;mLKJ`Q^u%GmQ6aew<(C#LeT-6?Q%J?!wMzUA%Gx%0ul+O-fQ7 z#n(~%Gez-_D#p{ov2Q_=>omzSqbE*%(~8{@VJ@OC_`07nhCg<=3Jia8Xv3Tbi>c$f zCG<%mR{=x@#n`p0f?{&E1>1=0&wyqrm}P&>*oaP~2ElI5yKqqPHG2hKS2&r`&r{Bf zWE`6Ua^;b2%Ibt-aZS;!0M5!hY+Z4(DLrz_nsM^L646|fEO499*rgD~-^q+M?qZzd zqE{(pHRsG%Nw+Iae^qN7*Cfo;b{fPyo))hwYEL#6oD`@`ZHea8-^u%JI4b z7GNRR%BRnm7G&&jr?~+K&`~n`7;?kM)y`U;vkuftwUd{NoH>h_OM|F-rH-+jdd$}( z;`}!>wKGuiUmy_6J1QAG)O=RXLH|JTjn($_MbNLB^T+J2Kj_?HECh+Q|(lDw- zqNDZmKm-tHeYBh4gB%|)2Z>NE%#B5)R~ACUcC6nanwuL7%em3a;7gpvFd15gpzaj!Mg+!EPbw%C6+cg!8^3=Eom^9AIfPmcMi6Of*S?`S4|8J`gIH|vJncp*OhvO; zL}&>@>ni!6z-S!muFDKW0z#9U=sp28;$y;$B^Na^b}0CAfQ>vSMWF6tq+mlj?|85e z=oV`Jck6oY)}ihUjZeu##Zd`niGoj)(1_R`9WmEhROpZ6qZH0|R>*%w3D~95QBu6t znSVl+=Nf##Z4B6FppW1pgzkaMzF>7hskmbe^b6698~iNS0f*Poza)Qw)2Y;BU=$M` zqtEx%cnugo1RtUCkLEtGFXKKiRgXV)b7=S@s)APg$Z~jvU~Ee_m-6M^JbAW~oSV?a z{C3uP9pcPc_3f zsg=BI<>=y2Jsq4KU!1-koT-NgM`VMfp6&gk9K>Qti-P`#!lL4?IUY}1BRepXOdp*D z1uye}UFFMi(dAWXHN3)|SnvxW8-JAH0lfM0xAm8k^_L?_uH1h_kishM-(T<(^6FTN zHmsS2*jx*3SRZurZ*Z+29ENo=oPl7OWJ4azYT$~T zi+PAjP&GR^9md@p=GK&r>eN=NsjsPch5pJ9z{699_>naL4A!#bKLYiv(jQ~7OxYLv zwhYM+;g!h!EEs<;sL=C_X}*MzSEP_Kv$a!BmPkTwSXR~{-YvM#d9pMEp(<&}5QQB5 z7%BvExD&FzzemQSWAE;=6SoeidK|G4|(hONyzN>$U+)71UyXTId{v>)SsoDiY ztY~cl3*%g=YM?M>;Xxwef7)Q?kvxiM{R>9K3%C_?|4v4DRQog_nn2c49Yr&AG#Q8g98_~DUNgh-#~Q4xY?$4J2PiR{-Sx^9cjWV^BN zmf5&w(P_x9&q;gKSyLdCivsJBk!AkhfBYwoqG3UK&w_~Jfe2H}^L$JaAaQIO4?^3g=su)*d78a;%dy6GJhWHq2j>8s& zAG^dq7A)6v&!u13lzyRRnRY$;%=cF^^&JduH1*AwGv-ZwFMYZjn{vLK$?Tx#rIXoz zvZZdq+STVl(O^A(W}7i54$E7eJtqRS&8l^0tULLU zIC;tw9)YYZzRvW2|0~z?rnuD5#B-xIEMoh>RbP-F9#G}$SE>3q7)NZQJc*IvA6_wF z9prsrpC-a6$i0>a;cTe~BddgXbKsR?_6mQp9{?^B_k<#nkl_-DkOeUbmjrOY)exzg zvzV%fcpsKx1pnj=ldxXT&oxPh;)`dU<@qiZNdE*e<-Axd8dJ{O?&2|JrIu^IXiUbq zP|x%6L+{u1?(`y=7&RY`!Nz)Sq%;7*wMs9Z^tgmiyy zSWCIX&v9DP{_(Fz?~eEO2m9cOy&JU7WMP^Tr>;55xnJ_9KuN278!HHZsh#}bpY0Eq zgw)UM5-Y;O6BYrUPYPg`H(gln%^vizsHbd<;*DpQ()nQie>&)#?e`+WC2Hq-b|^+u zX*?&bvtp425SZ#L06{1ar9c|+ry75_Jt)5LAD((U(#73L?r!nJ{P=vilA~H0SvMp+ zeJ*!XLt$Grwm+2H3YrHJh`7NmAXm6ULxh1?XH{zPb%_xYs~vWf;wpfeL1QKk))Q|2 zO4_ra!@E#n+m_UMJf(EW_A%7RJ^pfCuzn==5sG@t&VV~>9WPUVN* zz$5-Y-vhXx&~1)o0spFN@or{7!#mA*-^w}1D42s*@RD*j_I-`%2i?30cG-CKDw>Cm z+LtqGLS;KyF$7VFC;7N?&LElePQ`)VjX1!e2L4TM))#b^ zH7Bo;%tn6rRh*KycOQ~4&=-GY00T6NDMNAR8A&+mF*=9$`T^`NwS$2JMQB^5OC!ya z9=c4B%#P&^Pcc@&8)}6xE+yYFg6)&2HVM}3-coHu9e4MWlsNfQ>gOB}`k9^Ci|}#< z4__#Oi58tHSP;&I{kKvGvZ<R_0w< zhVeA$lfsopVWKQtxPyOX`7#!kS+Fdl!meddsTr@S4Eo!|%FWc8k9>O?_c}m8*iDVy zmpE8?b>C=)a0vB6v=d^4$}|+~%uGw6^3rIUKuDl%;(0|Hr(rFT)@bP}6PXn*S#Xuv zY&czUH^9AO5YBfOPwkaDgO3^=@*84sx!&ntVJMS4m%7*hh@*eNK?p<1AFL)}&5;hQ z&`5SEACIiFRac`0=Wk0t767;z$0tkEFe9REfsviNOZPRoE{OY;4w?Z zEf%>pP8eSWsWK5FjJmW&s_3<-FFC@pN;08!sy{`Q%6lY^c9>6QIo7k1(Vm_O*$)De z#73OB0j+)D(%3MM=bTh_E6`ixDfFemnfWuV0Y*{4#a25*ayC+u5x}0vHs`; zeAB@_9s1Dc77M0naMv$B2ql?=5i$``8YV_LUzx|Krw=&rql|HZh2YpJu75qzz2HE) zRElJc_-oOq=g=(7)1@}njo*bh6dz&{L7#SnMOZa3=Ku?F@8Pfu1qWWGSt5&SnmJbH z`J5@xd^ykyPR|iqIb$&fIf59Yia07iiI>}+K&^is zoRHV2gT3>?dXuae9u^YL*SsMD%v)TG>l~b@`-3;{priY1li(N{f0cbU%S+C|uvrdh zPCVjd+G$S7xq{37dgrPnGw9y>o^B}4#B(T3R%*=n3F1m)MrjCLQNc{rP? zRHIFGo_rDtmIm*s=0jeZt^H)JLXsaHbC-bpIyfDWc-mR2F#pag9vz>PH^&!8`_c=3 zDI3bhk0;vwTb7A`fAJ_+n_oqL+wIBHo|*_-rTHXNV~Bd z`QO>u!oQuJt+x2LozVqM{&#kI?H6S0Ddpd_z#w_Fu-vrwe_yHme-Zk>yPehly;}c2 ziT>|q^?$q8{I&j%^#92(Kdm1ey*XY?G`6=l3-y1mmy-W(r`_FoLE29#|KF(oKct?9 z%P7|W&L_?KqyzGQ1hGh;ATO)~FEpZeoJksI{$!##4}G!^HOXmsQ1=5_Cs_QgHKFUa zb^{NmD>V_hpY zZM@Tm)N}=S`_vseI$yF9Jv<5K0plmNeAo8Bw*R&Ludn&-e{kRc=C~ip{&&;)pKfQn z)2r?OQ(P|fd|R;}8sWfi{O(w)X6xd!tTWgs<&&JZee{KJ3`(Iy6vHy9Rd%5->Zd3NZx3jZd+yAGyYEiH4e{KJ3`(NAt+WzO; z|HVVHsrJ8Oi-M~$Y*bVN|0l(XgS`*av|1s@^^8f$< diff --git a/script/CKAN_JRO/jro_api.py b/script/CKAN_JRO/jro_api.py index 4681a0c..ae207a5 100755 --- a/script/CKAN_JRO/jro_api.py +++ b/script/CKAN_JRO/jro_api.py @@ -35,6 +35,7 @@ class JROAPI(): - action - upload_file - upload_multiple_files + - upload_multiple_files_advance - show - search - create @@ -378,7 +379,7 @@ class JROAPI(): elif type_option == 'job': return getattr(self.ckan.action, 'job_show')(id=id, **kwargs) else: - return 'ERROR:: "%s" is not accepted' % (type_option) + return 'ERROR:: "type_option = %s" is not accepted' % (type_option) except: _, exc_value, _ = sys.exc_info() return exc_value @@ -513,7 +514,7 @@ class JROAPI(): return getattr(self.ckan.action, 'tag_search')(**self.dict) else: - return 'ERROR:: "%s" is not accepted' % (type_option) + return 'ERROR:: "type_option = %s" is not accepted' % (type_option) except: _, exc_value, _ = sys.exc_info() @@ -521,7 +522,7 @@ class JROAPI(): else: return 'ERROR:: "type_option" must be ' - def create(self, type_option, **kwargs): + def create(self, type_option, select=None, **kwargs): ''' FINALIDAD: Funcion personalizada para crear. @@ -548,8 +549,19 @@ class JROAPI(): return getattr(self.ckan.action, 'tag_create')(**kwargs) elif type_option == 'user': return getattr(self.ckan.action, 'user_create')(**kwargs) + elif type_option == 'views': + if 'resource' == select: + self.list = ['package'] + for key1, value1 in kwargs.items(): + if not key1 in self.list: + self.dict[key1] = value1 + return getattr(self.ckan.action, 'resource_create_default_resource_views')(**self.dict) + elif 'dataset' == select: + return getattr(self.ckan.action, 'package_create_default_resource_views')(**kwargs) + else: + return 'ERROR:: "select = %s" is not accepted' % (select) else: - return 'ERROR:: "%s" is not accepted' % (type_option) + return 'ERROR:: "type_option = %s" is not accepted' % (type_option) except: _, exc_value, _ = sys.exc_info() return exc_value @@ -580,7 +592,7 @@ class JROAPI(): elif type_option == 'collaborator': return getattr(self.ckan.action, 'package_collaborator_create')(**kwargs) else: - return 'ERROR:: "%s" is not accepted' % (type_option) + return 'ERROR:: "type_option = %s" is not accepted' % (type_option) except: _, exc_value, _ = sys.exc_info() return exc_value @@ -609,7 +621,7 @@ class JROAPI(): elif 'purge' == select: return getattr(self.ckan.action, 'dataset_purge')(**kwargs) else: - return 'ERROR:: "%s" is not accepted' % (select) + return 'ERROR:: "select = %s" is not accepted' % (select) elif type_option == 'project': if select is None: return 'ERROR:: "select" must not be "None"' @@ -619,7 +631,7 @@ class JROAPI(): elif 'purge' == select: return getattr(self.ckan.action, 'organization_purge')(**kwargs) else: - return 'ERROR:: "%s" is not accepted' % (select) + return 'ERROR:: "select = %s" is not accepted' % (select) elif type_option == 'resource': return getattr(self.ckan.action, 'resource_delete')(**kwargs) elif type_option == 'vocabulary': @@ -629,7 +641,7 @@ class JROAPI(): elif type_option == 'user': return getattr(self.ckan.action, 'user_delete')(**kwargs) else: - return 'ERROR:: "%s" is not accepted' % (type_option) + return 'ERROR:: "type_option = %s" is not accepted' % (type_option) except: _, exc_value, _ = sys.exc_info() return exc_value