Added block read from socket

ApplicationCode/SocketInterface/RiaSocketTools.cpp

@@ -147,3 +147,46 @@ bool RiaSocketTools::writeBlockData(RiaSocketServer* server, QTcpSocket* socket,
     return true;
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RiaSocketTools::readBlockData(QTcpSocket& socket, char* data, quint64 bytesToRead, QStringList& errorMessages)
+{
+    quint64 bytesRead = 0;
+    int blockCount = 0;
+
+    quint64 maxBlockSize = RiaApplication::instance()->preferences()->blockSize();
+
+    while (bytesRead < bytesToRead)
+    {
+        if (socket.bytesAvailable())
+        {
+            quint64 byteCountToRead = qMin(bytesToRead - bytesRead, maxBlockSize);
+
+            qint64 actuallyBytesRead = socket.read(data + bytesRead, byteCountToRead);
+            if (actuallyBytesRead < 0)
+            {
+                errorMessages.push_back("Error detected when writing data, error string from socket");
+                errorMessages.push_back(socket.errorString());
+
+                return false;
+            }
+
+            bytesRead += actuallyBytesRead;
+            blockCount++;
+        }
+        else
+        {
+            if (!socket.waitForReadyRead())
+            {
+                errorMessages.push_back("Waited for data for %1 milli seconds.");
+                errorMessages.push_back(socket.errorString());
+
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+

ApplicationCode/SocketInterface/RiaSocketTools.h

@@ -28,4 +28,5 @@ public:
     static void getCaseInfoFromCase(RimCase* rimCase, qint64& caseId, QString& caseName, QString& caseType, qint64& caseGroupId);
     
     static bool writeBlockData(RiaSocketServer* server, QTcpSocket* socket, const char* data, quint64 bytesToWrite);
+    static bool readBlockData(QTcpSocket& socket, char* data, quint64 bytesToRead, QStringList& errorMessages);
 };