1. petsc
  2. PETSc
  3. petsc

Commits

BarryFSmith  committed 43da4ab

updated for new SAWs interface for pushing and poping bodies and headers

  • Participants
  • Parent commits 82db75e
  • Branches master

Comments (0)

Files changed (2)

File src/sys/classes/draw/impls/x/xinit.c

View file
       gif  = gif->next;
     }
     ierr = PetscStrcat(body,"<br>\n");CHKERRQ(ierr);
-    PetscStackCallSAWs(SAWs_Set_Body,("index.html",1,body));
+    if (draw->savefilecount > 0) PetscStackCallSAWs(SAWs_Pop_Body,("index.html",1));
+    PetscStackCallSAWs(SAWs_Push_Body,("index.html",1,body));
   }
 #endif
 

File src/sys/objects/pinit.c

View file
       ierr = PetscSNPrintf(jsdir,PETSC_MAX_PATH_LEN,"%s/js",root);CHKERRQ(ierr);
       ierr = PetscTestDirectory(jsdir,'r',&flg);CHKERRQ(ierr);
       if (!flg) SETERRQ(PETSC_COMM_SELF,PETSC_ERR_FILE_READ,"-saws_local option requires js directory in root directory");
-      PetscStackCallSAWs(SAWs_Set_Local_JSHeader,());CHKERRQ(ierr);
+      PetscStackCallSAWs(SAWs_Push_Local_Header,());CHKERRQ(ierr);
     }
     ierr = PetscGetProgramName(programname,64);CHKERRQ(ierr);
     ierr = PetscStrlen(help,&applinelen);CHKERRQ(ierr);
     }
     ierr = PetscOptionsGetAll(&options);CHKERRQ(ierr);
     if (rootlocal && help) {
-      ierr = PetscSNPrintf(appline,applinelen,"<center> Running <a href=\"%s.c.html\">%s</a>%s</center><br><center><pre>%s</pre></center><br>\n",programname,programname,options,help);
+      ierr = PetscSNPrintf(appline,applinelen,"<center> Running <a href=\"%s.c.html\">%s</a> %s</center><br><center><pre>%s</pre></center><br>\n",programname,programname,options,help);
     } else if (help) {
       ierr = PetscSNPrintf(appline,applinelen,"<center>Running %s %s</center><br><center><pre>%s</pre></center><br>\n",programname,options,help);
     } else {
                                     "<center><h2> <a href=\"http://www.mcs.anl.gov/petsc\">PETSc</a> Application Web server powered by <a href=\"https://bitbucket.org/saws/saws\">SAWs</a> </h2></center>\n"
                                     "<center>This is the default PETSc application dashboard, from it you can access any published PETSc objects or logging data</center><br><center>%s configured at %s with %s</center><br>\n"
                          "%s",version,petscconfigureruntime,petscconfigureoptions,appline);
-    PetscStackCallSAWs(SAWs_Set_Body,("index.html",0,intro));
+    PetscStackCallSAWs(SAWs_Push_Body,("index.html",0,intro));
     ierr = PetscFree(intro);CHKERRQ(ierr);
     ierr = PetscFree(appline);CHKERRQ(ierr);
     PetscStackCallSAWs(SAWs_Initialize,());