better version check

Common/Views.cpp

-// $Id: Views.cpp,v 1.73 2002-09-01 21:54:10 geuzaine Exp $
+// $Id: Views.cpp,v 1.74 2002-09-01 22:10:13 geuzaine Exp $
 //
 // Copyright (C) 1997 - 2002 C. Geuzaine, J.-F. Remacle
 //
@@ -551,21 +551,17 @@ void Read_View(FILE *file, char *filename){
 
       v = BeginView(0);
 
-      if(version >= 1.2){
-	fscanf(file, "%s %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d "
-	       "%d %d %d %d %d %d %d %d %d %d %d %d %d\n", 
+      if(version <= 1.0){
+	fscanf(file, "%s %d %d %d %d %d %d %d %d %d %d %d %d %d\n", 
 	       name, &v->NbTimeStep,
 	       &v->NbSP, &v->NbVP, &v->NbTP, 
 	       &v->NbSL, &v->NbVL, &v->NbTL, 
 	       &v->NbST, &v->NbVT, &v->NbTT, 
-	       &v->NbSQ, &v->NbVQ, &v->NbTQ, 
-	       &v->NbSS, &v->NbVS, &v->NbTS,
-	       &v->NbSH, &v->NbVH, &v->NbTH,
-	       &v->NbSI, &v->NbVI, &v->NbTI,
-	       &v->NbSY, &v->NbVY, &v->NbTY,
-	       &v->NbT2, &t2l, &v->NbT3, &t3l);
+	       &v->NbSS, &v->NbVS, &v->NbTS);
+	v->NbT2 = t2l = v->NbT3 = t3l = 0;
+	Msg(INFO, "Detected version <= 1.0");
       }
-      else if(version >= 1.1){
+      else if(version == 1.1){
 	fscanf(file, "%s %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d\n", 
 	       name, &v->NbTimeStep,
 	       &v->NbSP, &v->NbVP, &v->NbTP, 
@@ -573,15 +569,26 @@ void Read_View(FILE *file, char *filename){
 	       &v->NbST, &v->NbVT, &v->NbTT, 
 	       &v->NbSS, &v->NbVS, &v->NbTS,
 	       &v->NbT2, &t2l, &v->NbT3, &t3l);
+	Msg(INFO, "Detected version 1.1");
       }
-      else{
-	fscanf(file, "%s %d %d %d %d %d %d %d %d %d %d %d %d %d\n", 
+      else if(version == 1.2){
+	fscanf(file, "%s %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d "
+	       "%d %d %d %d %d %d %d %d %d %d %d %d %d\n", 
 	       name, &v->NbTimeStep,
 	       &v->NbSP, &v->NbVP, &v->NbTP, 
 	       &v->NbSL, &v->NbVL, &v->NbTL, 
 	       &v->NbST, &v->NbVT, &v->NbTT, 
-	       &v->NbSS, &v->NbVS, &v->NbTS);
-	v->NbT2 = t2l = v->NbT3 = t3l = 0;
+	       &v->NbSQ, &v->NbVQ, &v->NbTQ, 
+	       &v->NbSS, &v->NbVS, &v->NbTS,
+	       &v->NbSH, &v->NbVH, &v->NbTH,
+	       &v->NbSI, &v->NbVI, &v->NbTI,
+	       &v->NbSY, &v->NbVY, &v->NbTY,
+	       &v->NbT2, &t2l, &v->NbT3, &t3l);
+	Msg(INFO, "Detected version 1.2");
+      }
+      else{
+	Msg(GERROR, "Unknown post-processing file format (version %g)", version);
+	return;
       }
 
       for(i=0;i<(int)strlen(name);i++) if(name[i]=='^') name[i]=' ';