From a46b454ed1d73420464f1dec32e6d05c5c36f198 Mon Sep 17 00:00:00 2001 From: dinesh Date: Wed, 13 Aug 2008 15:17:27 +0530 Subject: [PATCH] committing changes for web pages after update of create_tar_ball --- web/configuration | 3 +++ web/db/ccan.db | Bin 32768 -> 32768 bytes web/dispmoduleinfo.php | 41 +++++++++++++++++++++++++---------------- web/tarball/.tar | Bin 0 -> 30720 bytes web/uploader.php | 37 +++++++++++++++++++++++++------------ 5 files changed, 53 insertions(+), 28 deletions(-) create mode 100644 web/tarball/.tar diff --git a/web/configuration b/web/configuration index 7d0cc15e..d29bed87 100644 --- a/web/configuration +++ b/web/configuration @@ -40,4 +40,7 @@ $bzr_clone = 'bzr clone /home/dinesh/testwebsite/ '; //bzr push $bzr_push = 'bzr push /home/dinesh/testwebsite/ '; + +//tar home dir +$tar_dir = 'tarball/'; ?> \ No newline at end of file diff --git a/web/db/ccan.db b/web/db/ccan.db index 8d582d443992153c0cfa9b8897f91ef4652d78c2..77ba6a0124043f33651ca520d14f848fa4d6fc46 100755 GIT binary patch delta 4005 zcmaJ^OK%(373M=x%yI3+Zqmf=!zWZ-3+w)oln=ab!~*^>RA_VT%7 z+b2%_{`#3EJik0!3NJ1<&&*!S{?UB$)|bup>~C*%+ZNw#w$3+N=bs)fwPrUT{;OHA zxUqEif_OxFEG;*Q(jb%>9VB_^Q7SV($s!7T3N#(aOp+ik$fT>u6=66adY3m9iJ0Ug z5v8HLVObreg$`WWPXdpk$&ima!rimY#_BL}KJHnaPpnRXlUWX7*r8SabBp-tO{>!x z3*;$WO5WJEwdw83v&DPJ^W&+H!W-1hoN*JVl6$=3FS(%YZMEeXCfp$NhQH6 zHms;EBRh}->au;-f?)fEdA)A0&(d9kP9*juebum@rTKv<-Crf40G=X0$do3Ljq*sw zx=&87snFv+~wB;U*$h(vJTJu~t0k2XPs=`^PEeI(^pF>)`VM6g)-4qN^;nPd2pSFW;Mg zPv3v8>mazil3Niaxj>Ped>kD9r*dsp+B)%NU&~YjuP)Y0s94s)F!RnJrXp-a^ zQq%*zgAn^=vKl7g5qN~q(ntbX0A0|WK&F^9JmG|hl~meFa-D*H%o(MSSBRDY`XGZ& zl!C-J=UB5;;NLb*D01-21HJgDWyi_E8lYrO^(YJ+EmGu$p^G_NREKwD7NS6G?cBag zySH~JO1wNovO%b-4RPVKBPkUbUveg(+E`?zQaW!futZV&vUK_2eMcO zA|O%RI%BQV8|&*b9vlRFK`OmK43ccL&cD`oVbSn*Jb~oxcr=8yI&qWGvff_6j*=`G z1svHLwyh+cU~jC!rXGENW8*sA4fbd&6ce4q(`RpA`e_D(2jflfH;COZ2M4-9d>v~r z?jj}D*Xdp!gC$^)3b+uH%_RnKWn2TsLhA`~4+biZAu5|2rFL&HeQB##fT5`9z?{T~ z4^f1>qKj0B6GS>2&bPQMgP8SEr#$L(Pwb28f#4^&l7=E48pZZ?&cF^J8`)jPipk~$ ze&M5x#G2A1K-ta|*;mu`t7#8B*JDxwK0z;XNvm!j0*F6i!9pW8*}KLCo83D0jBeec z4Q>s!X3(puQjSEVB^BgQ_Y@gUkKQy_JDmmLTqSz6c~YiR3l%fYd?6t{W`a5d@f*p3+p8;-n)eL4Xle; zU&s13)+<=AVi6Xf{|?p_te3Ga&))sXAKE-8T$;V`!+*DD{~awY6%9rQ6uLi_h8o@n4 zHa6Ba3*Ueb12!m<0_Cy`T}XWwdRa3^KZtWQZdd}+bP>x6y$vwx)6#m=mF9gUNl|+d z1ukl)^s$|6Hn)^fun$iwvjzoQZw8UMp?rH-)=A??$@{XCxcU)H;%r&>42A{(ooSoPEwmfp z42ZSqwT9uoP$|lW_8DYz7{pD@1xP{1feiC2C@PI>o3$bI3GDBbrVbf&mSGOpxR(}n z4E7ykfDh+V#;pu$C902Dmbq2?wYKT^j?2IQ{}s#)QBn^*lnoA5l9g`Fxn``ZNCA78 z7Sr=vy_HjoABV``RSs99K|NyX@q;58u_q|zpa>7C5LOm> i>u4f`cOZs|RnEhm&ha`ZF&9;DT?P!}HMvNjSN;dJ_ delta 731 zcmZXQ&1(};6vgMxnMq=s#7tt$N41j_ghD8B;jXSEh|OB43neDgNK(^G=tPJhbV8}P zG|69}-MNboL8ahITvn>M@nfZnx(T@Grh?wdOw)=F4sYh(^UnRfXWO!E%a3P5w~Q-T3IW8)8LdWeflfY_GM;;kaS91?2^{CY!!HGbAJSi-lKHC@RelotuP0NGFB1F%|lEM$zktMuYkeDiGNiDK)ue+p7XlJ}(dQl;0ujz?F6gEtRW*|{+-KGZn;V>3rf=Q!P2)2tXP$~w!^ zSQ(bnPqNOl&amRF6wC3>vUKk|BCg$dc?@`TD-kaKB6yUP>33`j47#0FCH_$Ji%~~| j!T~dUyFY&7?Q+ydsz_Yfr{`^3A(g#rq)d!D8-L?33B|iU diff --git a/web/dispmoduleinfo.php b/web/dispmoduleinfo.php index b6f08172..b0aba20e 100644 --- a/web/dispmoduleinfo.php +++ b/web/dispmoduleinfo.php @@ -8,25 +8,20 @@ $handle = sqlite3_open($db) or die("Could not open database"); $query = "select * from search where module=\"".$_GET['module']."\""; $result = sqlite3_query($handle, $query) or die("Error in query: ".sqlite3_error($handle)); $row = sqlite3_fetch_array($result); - -if (!file_exists($repopath . $ccan_home_dir.$_GET['module']."/".$_GET['module'].".tar")) { - chdir($repopath); - exec("tar -cvvf ".$ccan_home_dir. $_GET['module']. "/". $_GET['module'].".tar ". $ccan_home_dir.$_GET['module'], $status); - chdir(".."); -} - -if (!file_exists($repopath . $ccan_home_dir.$_GET['module']."/".$_GET['module']."_dep.tar")) { - chdir($repopath); - exec($create_dep_tar." ".$ccan_home_dir.$_GET['module'], $status); - chdir(".."); -} - - ?> - - +
/.tar>Download/_dep.tar>Download Dependencies + Download'; + ?> + + Download Dependencies'; + ?> +
@@ -42,7 +37,21 @@ if (!file_exists($repopath . $ccan_home_dir.$_GET['module']."/".$_GET['module']. + + + +

Author:

>

Dependencies:

Description:


+ +" . $msg . "Contact ccan admin. "; + exit(); + } +} +?> \ No newline at end of file diff --git a/web/tarball/.tar b/web/tarball/.tar new file mode 100644 index 0000000000000000000000000000000000000000..54203d2cf0e7d7834b056d6e8fd2ded0d9df45e6 GIT binary patch literal 30720 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 Stored to temporary repository. Mail will be send to admin to get verification of the code."; + echo "
Stored to temporary repository. + Mail will be send to admin to get verification of the code."; unlink($tempfolder.$_FILES["uploadedfile"]["name"]); exit(); } @@ -73,14 +73,18 @@ if($_FILES["uploadedfile"]["type"] == "application/x-gzip" // if owner is not same if(!(getowner($ccan_home_dir . $folder, $db) == $_SESSION['susername'])) { if(!file_exists($repopath . $ccan_home_dir . $folder . '-' . $_SESSION['susername'])) - echo "
". $ccan_home_dir . $folder . " already exists. Renaming to " . $folder . "-" . $_SESSION['susername'] . "
"; + echo "
". $ccan_home_dir . $folder . + " already exists. Renaming to " . $folder . "-" . $_SESSION['susername'] . "
"; else - echo "
". $ccan_home_dir . $folder . "-" . $_SESSION['susername'] . " already exists. Overwriting " . $folder. "-" . $_SESSION['susername'] . "
"; + echo "
". $ccan_home_dir . $folder . + "-" . $_SESSION['susername'] . " already exists. Overwriting " . + $folder. "-" . $_SESSION['susername'] . "
"; $rename = $folder."-".$_SESSION['susername']; } else - echo "
".$repopath. $ccan_home_dir. $folder. " already exists(uploaded by you). Overwriting ". $repopath. $folder."
"; + echo "
".$repopath. $ccan_home_dir. $folder. + " already exists(uploaded by you). Overwriting ". $repopath. $folder."
"; } @@ -93,18 +97,25 @@ if($_FILES["uploadedfile"]["type"] == "application/x-gzip" rename($tempfolder . $folder, $exactpath . $ccan_home_dir . $rename); chdir($exactpath); - unset($op); exec($infotojson . $ccan_home_dir . $rename . " " . $ccan_home_dir. $rename."/_info.c ". $ccan_home_dir . $rename . "/json_" . $rename . " " . $_SESSION['susername']. " ../../" . $db, $op, $status); + unset($op); exec($infotojson . $ccan_home_dir . $rename . " " . $ccan_home_dir. + $rename."/_info.c ". $ccan_home_dir . $rename . "/json_" . $rename . " " + . $_SESSION['susername']. " ../../" . $db, $op, $status); checkerror($status,"Error: In infotojson."); unset($op); exec('bzr add', $op, $status); checkerror($status,"Error: bzr add error."); - unset($op); exec('bzr commit --unchanged -m "commiting from ccan web ' . $rename . " " . $_SESSION['susername'] . '"', $op, $status); + unset($op); exec('bzr commit --unchanged -m "commiting from ccan web ' . $rename . + " " . $_SESSION['susername'] . '"', $op, $status); checkerror($status,"Error: bzr commit error."); unset($op); exec($bzr_push, $op, $status); checkerror($status,"Error: bzr push error."); + unset($op); exec($create_dep_tar . " " . $ccan_home_dir. $rename . " ../../" . + $tar_dir . " ../../" . $db , $op, $status); + checkerror($status,"Error: bzr push error."); + chdir('../..'); rmdirr($exactpath); echo "
Stored to ". $ccan_home_dir . $rename . "
"; @@ -119,7 +130,9 @@ if($_FILES["uploadedfile"]["type"] == "application/x-gzip" if($score == '') $msg = 'Below is details for test.'; - echo "
Score for code is low. Cannot copy to repository. Moving to ". $junkcode.$folder.'-'.$_SESSION['susername']."...

". $msg ."

"; + echo "
Score for code is low. + Cannot copy to repository. Moving to ". $junkcode.$folder.'-'. + $_SESSION['susername']."...

". $msg ."

"; foreach($score as $disp) echo "$disp
"; -- 2.39.2