Added input file missing test and replaced wording of import/export with input/output.

[xestiaab/.git] / source / convert.cpp

diff --git a/source/convert.cpp b/source/convert.cpp
index d8578d7..8f6d7d1 100644 (file)
--- a/source/convert.cpp
+++ b/source/convert.cpp
@@ -26,7 +26,7 @@ ConvertResult ConvertContact(wxString InputFormat, wxString OutputFormat,
                wxT("vCard4") 
        };
 
-       bool ValidImport = false;
+       bool ValidInput = false;
        bool ValidOutput = false;
 
        // Check that the input format is valid.
@@ -34,26 +34,52 @@ ConvertResult ConvertContact(wxString InputFormat, wxString OutputFormat,
        for (long l = 0; l < ValidFormats.size(); l++){
        
                if (InputFormat == ValidFormats[l]){
-                       ValidImport = true;
+                       ValidInput = true;
                        break;
                }
        
        }
        
-       if (ValidImport == false){
+       if (ValidInput == false){
        
-               return CONVERTRESULT_INVALIDIMPORTFORMAT;
+               return CONVERTRESULT_INVALIDINPUTFORMAT;
        
        }
 
+       // Check that the output format is valid.
+
+       for (long l = 0; l < ValidFormats.size(); l++){
+       
+               if (OutputFormat == ValidFormats[l]){
+                       ValidOutput = true;
+                       break;
+               }
+       
+       }
+       
+       if (ValidOutput == false){
+       
+               return CONVERTRESULT_INVALIDOUTPUTFORMAT;
+       
+       }
+
+       // Check that the input and output formats
+       // are not the same.
+
        if (InputFormat == OutputFormat){
        
                return CONVERTRESULT_FORMATSSAME;
        
        }
        
-       // Check that the output format is valid.
-
+       // Check that the input file given exists.
+       
+       if (!wxFileExists(InputFilename)){
+               
+               return CONVERTRESULT_INPUTFILEMISSING;
+               
+       }
+       
        return CONVERTRESULT_OK;
        
 }
\ No newline at end of file