File locking into .lock seems to work fine

Samo Penic

2016-03-15 6e42ef0edaba59fd344e89ffd469202ff2bd39ac

 src/restore.c

@@ -1,3 +1,4 @@
/* vim: set ts=4 sts=4 sw=4 noet : */
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -16,7 +17,7 @@
#include "initial_distribution.h"
#include "io.h"

ts_bool parseDump(char *dumpfname) {
ts_vesicle *parseDump(char *dumpfname) {
   xmlDocPtr doc;
   xmlNodePtr cur, cur1,cur2;
   ts_vesicle *vesicle=NULL;
@@ -54,12 +55,12 @@
               cur2=cur1->xmlChildrenNode;
               while(cur2!=NULL){
                  if ((!xmlStrcmp(cur2->name, (const xmlChar *)"Points"))){
                     fprintf(stderr,"Found point data\n");
                     //fprintf(stderr,"Found point data\n");
                     if(vesicle!=NULL)
                        parseXMLVertexPosition(vesicle, doc, cur2);
                  }
                  if ((!xmlStrcmp(cur2->name, (const xmlChar *)"Cells"))){
                  fprintf(stderr,"Found cell(Bonds) data\n");
                  //fprintf(stderr,"Found cell(Bonds) data\n");
                     if(vesicle!=NULL)
                        parseXMLBonds(vesicle, doc, cur2);
                  }
@@ -80,13 +81,13 @@
   init_normal_vectors(vesicle->tlist);
   mean_curvature_and_energy(vesicle);

/* TODO: cells, polymeres, filaments, core, tape */
/* TODO: filaments */

   fprintf(stderr,"Restoration completed\n");
   write_vertex_xml_file(vesicle,999);
   vesicle_free(vesicle);
   exit(0);
   return TS_SUCCESS;
//   write_vertex_xml_file(vesicle,999);
//   vesicle_free(vesicle);
//   exit(0);
   return vesicle;
}

ts_bool setGlobalTapeTXTfromTapeTag(xmlDocPtr doc, xmlNodePtr cur){
@@ -99,7 +100,7 @@

/* this is a parser of additional data in xml */
ts_vesicle *parseTrisurfTag(xmlDocPtr doc, xmlNodePtr cur){
   fprintf(stderr,"Parsing trisurf tag\n");
   //fprintf(stderr,"Parsing trisurf tag\n");
   xmlNodePtr child;

#ifdef COMPRESS
@@ -129,9 +130,9 @@
       inflateInit(&infstream);
       inflate(&infstream, Z_NO_FLUSH);
       inflateEnd(&infstream);   
   fprintf(stderr,"%lu\n",cLen);
   //fprintf(stderr,"%lu\n",cLen);
   subtree[infstream.total_out]='\0'; //zero terminate string   
   fprintf(stderr,"%s\n",subtree);
   //fprintf(stderr,"%s\n",subtree);
   
   free(subtree);
#endif
@@ -221,7 +222,7 @@
      for(i=0;i<3;i++)   vtx[i]=strtok(NULL," ");
      j++;
   }   
   fprintf(stderr,"Parsing triangles %s j=%d\n",triangles,j);	
   //fprintf(stderr,"Parsing triangles %s j=%d\n",triangles,j);	

   xmlFree(triangles);
   return TS_SUCCESS;
@@ -245,7 +246,7 @@
      j++;
      for(i=0;i<3;i++)   ntria[i]=strtok(NULL," ");
   }   
   fprintf(stderr,"Parsing triangle neighbors j=%d\n",j);	
   //fprintf(stderr,"Parsing triangle neighbors j=%d\n",j);	

   xmlFree(triangles);
   return TS_SUCCESS;
@@ -315,7 +316,7 @@
      }
      child=child->next;
   }
   fprintf(stderr,"Vertices position j=%d\n",idx);	
   //fprintf(stderr,"Vertices position j=%d\n",idx);	

   return TS_SUCCESS;
}
@@ -341,7 +342,7 @@
            //find grafted vtx
               if((vesicle->tape->nmono-1)==(idx-3*(vesicle->vlist->n-2))%(vesicle->tape->nmono)){
                  polyidx=(idx-3*(vesicle->vlist->n-2))/(vesicle->tape->nmono);
                  fprintf(stderr,"poly=%d, vertex=%d\n",polyidx,atoi(token[0]));
                  //fprintf(stderr,"poly=%d, vertex=%d\n",polyidx,atoi(token[0]));
                  vesicle->poly_list->poly[polyidx]->grafted_vtx=vesicle->vlist->vtx[atoi(token[0])];
                  vesicle->vlist->vtx[atoi(token[0])]->grafted_poly=vesicle->poly_list->poly[polyidx];
               }
@@ -355,7 +356,7 @@
      xmlFree(conname);
      child=child->next;
   }
   fprintf(stderr,"Bond data j=%d\n",idx);	
   //fprintf(stderr,"Bond data j=%d\n",idx);	
   return TS_SUCCESS;
}