DistRen Changeset - e7953e5dac1e · protofusion repositories

Changeset - e7953e5dac1e

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Ethan Zonca (ethanzonca) - 16 years ago 2010-02-23 22:38:38
e@ethanzonca.com

Updates to uploading

1 file changed with 3 insertions and 4 deletions:

src/server/slavefuncs.c

0 comments (0 inline, 0 general)

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -446,13 +446,13 @@ void prepareJobPaths(int jobnum,char *da @@
   // Variable Preparation
   char *jobdatapath;
    _distren_asprintf(&jobdatapath, "job%d", jobnum);
    _distren_asprintf(urltoTar, "http://data.distren.org/job%d/job%d.tar.gz", jobnum); // Prepares URL to download from
    _distren_asprintf(pathtoTar, "%s/stor/jobdata/job%d.tar.gz", datadir, jobnum); // Prepares destination to save to
    _distren_asprintf(pathtoJobfile, "%s/%s/job.blend", datadir, jobdatapath ); // Prepares the path to the jobfile
-   _distren_asprintf(urltoOutput, "http://data.distren.org/tmp/", jobdatapath ); // Prepares the URL where output is posted
+   _distren_asprintf(urltoOutput, "http://data.distren.org/upload.php"); // Prepares the URL where output is posted
    _distren_asprintf(pathtoXml, "%s/job%d/job%d.xml", datadir, jobnum ); // Prepares the path to the job's XML file
    free(jobdatapath);
+}
 int checkUsername(char *username){
   if(username == NULL || strcmp(username, "!username") == 0 ) {
@@ @@ -484,12 +484,13 @@ void slaveTest(){ @@
   int command;
   int test = 1;
   int jobnum = 0;
   fprintf(stderr,"Hello!\n");
   char tmpString1[100] = "";
   char tmpString2[100] = "";
   char *uploadURL = "http://data.distren.org/upload.php";
   while(test == 1)
+   {
      fprintf(stderr, "Welcome to DistRenSlave Alpha Interactive Test Mode\n\n");
      fprintf(stderr, "\t1 \tTest posting (uploading) data\n");
      fprintf(stderr, "\t2 \tTest getting frame from server\n");
@@ @@ -501,15 +502,13 @@ void slaveTest(){ @@
      switch(command)
+     {
      case 1:
        fprintf(stderr,"Path to file to upload: ");
        scanf("%99s", tmpString1);
        fprintf(stderr,"URL to upload to: ");
        scanf("%99s", tmpString2);
        uploadOutput(tmpString1, tmpString2);
        uploadOutput(tmpString1, uploadURL);
        break;
      case 2:
        fprintf(stderr,"Remotio not implemented yet!\n");
        break;
      case 3:
        fprintf(stderr,"URL to file: ");

0 comments (0 inline, 0 general)