Commit fb21de38 authored by Hyun Soo Kim's avatar Hyun Soo Kim
Browse files

move database name parsing inside server code since client does not need it

parent 06b9e7a1

src/Main.java

+11 −7
Original line number Diff line number Diff line
@@ -137,13 +137,7 @@ public class Main { 
            moleculePath = args[2];

        }



        // Set the default filename for the database

        String dbName = "molecule.db";



        // Check if an alternative filename is provided as a command line argument

        if (ARG_COUNT > 3) {

            dbName = args[3];

        }

        // run as client or server

        try (Socket clientSocket = new Socket("localhost", PORT_NUMBER)) {

            // If a client connection is successful, run the client side of the program

            runClient(clientSocket, cmd + " " + moleculePath);
@@ -151,6 +145,16 @@ public class Main { 
            // If a client connection fails, run the server side of the program

            ServerSocket serverSocket = new ServerSocket(PORT_NUMBER);

            serverSocket.setSoTimeout(60 * 1000);



            // Set the default filename for the database

            String dbName = "molecule.db";



            // Check if an alternative filename is provided as a command line argument

            if (ARG_COUNT > 3) {

                dbName = args[3];

            }



            // start server

            runServer(serverSocket, cmd, moleculePath, dbName);

            serverSocket.close();

        }