commiting uploaded for bzr

diff --git a/web/configuration b/web/configuration
index 80c6b88960a1013ab60f527e7b6b1eb76a040d70..7d0cc15e714a642d7d1e8b11357c07660ee74bd5 100644 (file)
--- a/web/configuration
+++ b/web/configuration
@@ -9,10 +9,10 @@ $repopath = "testrepo/";
 $ccanlint = "tools/ccanlint -d ";
 
 //infotojson 
 $ccanlint = "tools/ccanlint -d ";
 
 //infotojson 

-$infotojson = "tools/infotojson ";
+$infotojson = "../../tools/infotojson ";

 
 //create tar of all dependencies
 
 //create tar of all dependencies

-$create_dep_tar = "../tools/create_dep_tar ";
+$create_dep_tar = "../../tools/create_dep_tar ";

 
 //junk code
 $junkcode = "junkcode/";
 
 //junk code
 $junkcode = "junkcode/";


@@ -32,5 +32,12 @@ $frommail = "ccan@ozlabs.org";
 //email for admins
 $ccan_admin = "g.dinesh.cse@gmail.com";
 
 //email for admins
 $ccan_admin = "g.dinesh.cse@gmail.com";
 

+//ccan home 

 $ccan_home_dir = "ccan/";
 $ccan_home_dir = "ccan/";

+
+//bzr clone 
+$bzr_clone = 'bzr clone /home/dinesh/testwebsite/ ';
+
+//bzr push 
+$bzr_push = 'bzr push /home/dinesh/testwebsite/ ';

 ?>
\ No newline at end of file
 ?>
\ No newline at end of file

diff --git a/web/db/ccan.db b/web/db/ccan.db
index 30078430204eee429a34814a69569db88508b1fe..8d582d443992153c0cfa9b8897f91ef4652d78c2 100755 (executable)
Binary files a/web/db/ccan.db and b/web/db/ccan.db differ

diff --git a/web/uploader.php b/web/uploader.php
index 467c51c04e7e0e4af1a22f3aa1419d00ff056df7..102ac1dc0f855c9523757af966cfddaef4b53726 100644 (file)
--- a/web/uploader.php
+++ b/web/uploader.php
@@ -28,16 +28,8 @@ if($_FILES["uploadedfile"]["type"] == "application/x-gzip"
        else {
                exec('tar -xf '.$tempfolder.$_FILES["uploadedfile"]["name"].' -C '.$tempfolder, $op, $status);
        }
        else {
                exec('tar -xf '.$tempfolder.$_FILES["uploadedfile"]["name"].' -C '.$tempfolder, $op, $status);
        }

-       checkerror($status[0],"Error: cannot extract(tar error).");     
+       checkerror($status,"Error: cannot extract(tar error).");        

 
 

-       //chmod
-       exec('chmod -R 0777 '. $tempfolder.$folder, $status);
-       checkerror($status[0],"Error: chmod execution error."); 
-       
-       //running ccanlint
-       exec($ccanlint.$tempfolder.$folder, $score, $status);
-       //checkerror($status,"Error: ccanlint execution error.");       
-       

        //if user not logged in
        if($_SESSION["slogged"] == false) {
                //move to temp folder 
        //if user not logged in
        if($_SESSION["slogged"] == false) {
                //move to temp folder 


@@ -48,8 +40,6 @@ if($_FILES["uploadedfile"]["type"] == "application/x-gzip"
                //send mail for review to admins 
                $subject = "Review: code upload at temporary repository"; 
                $message = "Some developer has uploaded code who has not logged in.\n\nModule is stored in ".$temprepo.$folder.".\n\nOutput of ccanlint: \n";
                //send mail for review to admins 
                $subject = "Review: code upload at temporary repository"; 
                $message = "Some developer has uploaded code who has not logged in.\n\nModule is stored in ".$temprepo.$folder.".\n\nOutput of ccanlint: \n";

-               foreach($score as $disp)
-                       $message = $message.$disp."\n";

                        
        $toaddress = getccanadmin($db);
        mail($toaddress, $subject, $message, "From: $frommail");
                        
        $toaddress = getccanadmin($db);
        mail($toaddress, $subject, $message, "From: $frommail");


@@ -58,45 +48,83 @@ if($_FILES["uploadedfile"]["type"] == "application/x-gzip"
        exit();
        } 
 
        exit();
        } 
 

+       //running ccanlint
+       exec($ccanlint.$tempfolder.$folder, $score, $status);
+               

        //if not junk code 
        if($status == 0) {
                $rename = $folder;
        //if not junk code 
        if($status == 0) {
                $rename = $folder;

+               $exactpath = $repopath . $_SESSION['susername'] .'/';
+               
+               if (file_exists($exactpath)) {
+                       echo "<div align=\"center\"> Your another upload is in progress please wait...</div>";
+                       exit();
+               }
+               
+               //bzr local repo for commit
+               chdir($repopath);
+               unset($op); exec($bzr_clone . $_SESSION['susername'], $op, $status);
+               checkerror($status, "Error: bzr local repo.");
+               chdir('..');
+                               

                //if module already exist 
                //if module already exist 

-               if (file_exists($repopath.$ccan_home_dir . $folder)) {
+               if (file_exists($exactpath . $ccan_home_dir . $folder)) {
+

                        // if owner is not same 
                        // if owner is not same 

-                       if(!(getowner($repopath.$ccan_home_dir.$folder, $db) == $_SESSION['susername'])) {      
-                               if(!file_exists($repopath . $ccan_home_dir. $folder.'-'.$_SESSION['susername']))                        
-                               echo "<div align=\"center\">".$repopath . $ccan_home_dir. $folder . " already exists. Renaming to ". $folder."-".$_SESSION['susername']."</div>";
+                       if(!(getowner($ccan_home_dir . $folder, $db) == $_SESSION['susername'])) {      
+                               if(!file_exists($repopath . $ccan_home_dir . $folder . '-' . $_SESSION['susername']))                           
+                               echo "<div align=\"center\">". $ccan_home_dir . $folder . " already exists. Renaming to " . $folder . "-" . $_SESSION['susername'] . "</div>";

                else
                else

-                               echo "<div align=\"center\">".$repopath . $ccan_home_dir. $folder."-".$_SESSION['susername'] . " already exists. Overwriting ". $folder."-".$_SESSION['susername']."</div>";
+                               echo "<div align=\"center\">". $ccan_home_dir . $folder . "-" . $_SESSION['susername'] . " already exists. Overwriting " . $folder. "-" . $_SESSION['susername'] . "</div>";

                        $rename = $folder."-".$_SESSION['susername'];
                }
                        $rename = $folder."-".$_SESSION['susername'];
                }

+               

                else
                else

-                       echo "<div align=\"center\">".$repopath. $ccan_home_dir. $folder. " already exists(uploaded by you). Overwriting ". $repopath. $folder."</div>";        
+                       echo "<div align=\"center\">".$repopath. $ccan_home_dir. $folder. " already exists(uploaded by you). Overwriting ". $repopath. $folder."</div>";
+                               

                }
                }

+

                //module not exist. store author to db 
                else {
                //module not exist. store author to db 
                else {

-                       storefileowner($repopath . $ccan_home_dir. $folder, $_SESSION['susername'], $db);
+                       storefileowner($ccan_home_dir . $folder, $_SESSION['susername'], $db);

                }
                }

-               rmdirr($repopath. $ccan_home_dir. $rename);
-      rename($tempfolder.$folder, $repopath. $ccan_home_dir. $rename);
-      echo "<div align=\"center\"> Stored to ".$repopath . $ccan_home_dir. $rename . "</div>";
+
+               rmdirr($exactpath . $ccan_home_dir . $rename);
+          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);
+               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);
+               checkerror($status,"Error: bzr commit error."); 
+                       
+               unset($op); exec($bzr_push, $op, $status);
+               checkerror($status,"Error: bzr push error.");

                
                

-               exec($infotojson . $repopath. $ccan_home_dir. $rename."/_info.c ". $repopath. $ccan_home_dir. $rename."/json_".$rename. " ". $_SESSION['susername']." ".$db, $status);
-               checkerror($status[0],"Error: In infotojson."); 
-               //createsearchindex($rename, $repopath.$rename, $infofile, $db, $_SESSION['susername']);
+               chdir('../..');
+               rmdirr($exactpath);
+       echo "<div align=\"center\"> Stored to ". $ccan_home_dir . $rename . "</div>";

        }
        
        //if junk code (no _info.c etc) 
        else {
        }
        
        //if junk code (no _info.c etc) 
        else {

+       

                rmdirr($junkcode.$folder.'-'.$_SESSION['susername']);
                rename($tempfolder.$folder, $junkcode.$folder.'-'.$_SESSION['susername']);
                rmdirr($junkcode.$folder.'-'.$_SESSION['susername']);
                rename($tempfolder.$folder, $junkcode.$folder.'-'.$_SESSION['susername']);

+               

                if($score == '')
                        $msg =  'Below is details for test.';
                if($score == '')
                        $msg =  'Below is details for test.';

+                       

                echo "<div align=\"center\"><table><tr><td> Score for code is low. Cannot copy to repository. Moving to ". $junkcode.$folder.'-'.$_SESSION['susername']."... </br></br>". $msg ." </br></br></td></tr><tr><td>";
                echo "<div align=\"center\"><table><tr><td> Score for code is low. Cannot copy to repository. Moving to ". $junkcode.$folder.'-'.$_SESSION['susername']."... </br></br>". $msg ." </br></br></td></tr><tr><td>";

+

                foreach($score as $disp)
                        echo "$disp</br>";
                echo "</td></tr></table></div>";
                foreach($score as $disp)
                        echo "$disp</br>";
                echo "</td></tr></table></div>";

+               

        }
        unlink($tempfolder.$_FILES["uploadedfile"]["name"]);
 }
        }
        unlink($tempfolder.$_FILES["uploadedfile"]["name"]);
 }